gnumake3: complex tests in sfx2

4 files changed, 10 insertions, 7 deletions

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index ed9dcc3721e6..ed9dcc3721e6 100644..100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index cab1918e05eb..681aad96a6b4 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -31,7 +31,7 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
 define gb_JavaClassSet__command
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) && \
-    $(gb_JavaClassSet_JAVACCOMMAND) -cp $(CLASSPATH) -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
+    $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
     touch $(1))
 
 endef
@@ -63,7 +63,6 @@ $(1)/$(2).java
 endef
 
 define gb_JavaClassSet_add_sourcefile
-$(info $(1) $(2) $(foreach reponame,$(gb_Helper_REPOSITORYNAMES),$(reponame):$(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
 $(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
     $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index a1113c72d85e..fb3795a12b27 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -43,9 +43,9 @@ $(call gb_JunitTest_get_target,%) : $(gb_JunitTest_JAVACOMMAND)
         $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES))
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,%) : CLASSPATH := $(value XCLASSPATH):$(OOO_JUNIT_JAR):$(OUTDIR)/bin/OOoRunner.jar:$(OUTDIR)/bin/ridl.jar:$(OUTDIR)/bin/test.jar:$(OUTDIR)/bin/unoil.jar:$(OUTDIR)/bin/jurt.jar:$(OUTDIR)/lib:$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))
-$(call gb_JunitTest_get_target,%) : CLASSES :=
-$(call gb_JunitTest_get_target,%) : DEFS := \
+$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH):$(OOO_JUNIT_JAR):$(OUTDIR)/bin/OOoRunner.jar:$(OUTDIR)/bin/ridl.jar:$(OUTDIR)/bin/test.jar:$(OUTDIR)/bin/unoil.jar:$(OUTDIR)/bin/jurt.jar:$(OUTDIR)/lib:$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))
+$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
+$(call gb_JunitTest_get_target,$(1)) : DEFS := \
     -Dorg.openoffice.test.arg.soffice=path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice \
     -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
     -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$*) \
@@ -55,8 +55,12 @@ $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call
 $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
 endef
 
+define gb_JunitTest_set_defs
+$(call gb_JunitTest_get_target,$(1)) : DEFS := $(2)
+
+endef
+
 define gb_JunitTest_add_classes
-$(info .>.> $(1) $(2))
 $(call gb_JunitTest_get_target,$(1)) : CLASSES += $(2)
 endef
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 35d632f06b4c..65a13902676d 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -118,7 +118,7 @@ endef
 # Here we include the file (in it there will be a call to
 # gb_Module_register_target) and pop one target from each stack afterwards.
 define gb_Module_add_target
-include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2).mk
+include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
 $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
 $(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
 gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))