[Libreoffice-commits] .: solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 16 04:40:49 PST 2012
solenv/gbuild/JavaClassSet.mk | 2 +-
solenv/gbuild/JunitTest.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 60d2248aef20aa1363ef8624ff303c854c68dafe
Author: Enrico Weigelt, metux ITS <metuxitservice at googlemail.com>
Date: Wed Nov 14 18:19:26 2012 +0100
fixed java classpath parameter (required for gcj)
Change-Id: I0ad426a8791ab514978e01914f9f797b45d0c79a
Reviewed-on: https://gerrit.libreoffice.org/1073
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index b5b7439..fab3ae4 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -47,7 +47,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(filter-out $(JARDEPS),$(4))) && \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
- -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
+ -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
@$$RESPONSEFILE &&) \
rm -f $$RESPONSEFILE &&) \
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index fbe87fd..6ed1f77 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -49,7 +49,7 @@ $(call gb_JunitTest_get_target,%) :
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
(DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \
$(gb_JunitTest_JAVACOMMAND) \
- -cp "$(T_CP)" \
+ -classpath "$(T_CP)" \
$(DEFS) \
org.junit.runner.JUnitCore \
$(CLASSES) > $@.log 2>&1 || \
More information about the Libreoffice-commits
mailing list