diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-09 14:31:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-09 14:45:59 +0200 |
| commit | 91af205a93440b82ff1730528e98e6355092e02c (patch) | |
| tree | 4ccb2748796a0278c06f4809fe8c517349a9381f /solenv/gbuild/JunitTest.mk | |
| parent | 6e407a58872c0bef1be1cdf825cffb7902cb5699 (diff) | |
Don't misuse CLASSPATH for what goes into the -cp option to javac
CLASSPATH is supposed to show where to find the classes needed by Java
programs running at build time. The -cp switch to javac tells where to
find classes referenced by the code being compiled. These are
different things. (But it doesn't seem to have mattered much in our
build system.) So use T_CP instead, named in the same fashion as
T_CXXFLAGS etc.
But... for some reason this change, which as such should be just more
or less cosmetic, also fixes a build problem in the "scripting" module
on Windows, seen by Noel Grandin
(http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/19016
) and me.
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 5afe59580bb9..177cad6f7e2b 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -47,7 +47,7 @@ $(call gb_JunitTest_get_target,%) : rm -rf $(call gb_JunitTest_get_userdir,$*) && \ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \ - -cp "$(CLASSPATH)" \ + -cp "$(T_CP)" \ $(DEFS) \ org.junit.runner.JUnitCore \ $(CLASSES) > $@.log 2>&1 || \ @@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) @@ -105,12 +105,12 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile)) endef define gb_JunitTest_set_classpath -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(2) endef define gb_JunitTest_add_jar -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) endef |