[Libreoffice-commits] .: 2 commits - solenv/gbuild soltools/prj

[Stephan Bergmann]

 solenv/gbuild/JunitTest.mk |    8 ++------
 soltools/prj/build.lst     |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 77d120691d0bf8636f86e34a8d4926c260d73f68
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 17 11:07:29 2012 +0100

    Pass JunitTest jar deps to underlying JavaClassSet
    
    ...and make underlying JavaClassSet implicitly depend on OOO_JUNI_JAR
    ...and remove unused gb_JunitTest_set_classpath

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8d3656a..5cef3a4 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -74,6 +74,7 @@ $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(call gb_JunitTest_JunitTest_platform,$(1))
 
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
+$(call gb_JavaClassSet_add_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR))
 $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
 $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
 endef
@@ -104,12 +105,8 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
 
 endef
 
-define gb_JunitTest_set_classpath
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(2)
-
-endef
-
 define gb_JunitTest_add_jar
+$(call gb_JavaClassSet_add_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
 $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2)
 $(call gb_JunitTest_get_target,$(1)) : $(2)
 $(2) :| $(gb_Helper_PHONY)
@@ -147,7 +144,6 @@ gb_JunitTest_add_classes :=
 gb_JunitTest_add_class :=
 gb_JunitTest_add_sourcefile :=
 gb_JunitTest_add_sourcefiles :=
-gb_JunitTest_set_classpath :=
 gb_JunitTest_add_jar :=
 gb_JunitTest_add_jars :=
 gb_JunitTest_add_package_dependency :=
commit 98f60e460ea64f061ca6948691a29d4cf29eb0a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 17 11:05:45 2012 +0100

    No SUN dependencies anymore

diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 78eb3fc..9ee36a7 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,4 +1,4 @@
-so  soltools :   solenv SUN:so_prereq NULL
+so  soltools : solenv NULL
 so	soltools								usr1	-	all	so_usr1 NULL
 so	soltools\inc							get	-	all	so_inc NULL
 so	soltools\ldump							nmake	-	w	so_ldump so_mkdep NULL