[Libreoffice-commits] core.git: 2 commits - dbaccess/CppunitTest_dbaccess_hsqldb_test.mk solenv/gbuild

[David Tardon]

 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk |    4 ++++
 solenv/gbuild/CppunitTest.mk                 |   20 ++++++++++++++++++++
 solenv/gbuild/Jar.mk                         |    1 +
 3 files changed, 25 insertions(+)

New commits:
commit 2a87b3b5aed8296a7506374fd5324c5659a88cb5
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jul 27 13:18:32 2014 +0200

    gbuild: allow a unit test to depend on a jar file
    
    Change-Id: I68edf70e41023d3056859d49005c684b7c4e24d6

diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 69571b4..0dd08cb 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -71,6 +71,10 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
     xmloff/util/xo \
 ))
 
+$(eval $(call gb_CppunitTest_use_jars,dbaccess_hsqldb_test,\
+	sdbc_hsqldb \
+))
+
 $(eval $(call gb_CppunitTest_use_configuration,dbaccess_hsqldb_test))
 
 $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_hsqldb_test))
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index df5c61b..137adca 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -261,6 +261,26 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2))
 
 endef
 
+define gb_CppunitTest__use_java_ure
+$(call gb_CppunitTest_get_target,$(1)) : \
+    $(foreach jar,java_uno juh jurt unoil unoloader,$(call gb_Jar_get_target,$(jar))) \
+    $(call gb_Library_get_target,affine_uno_uno) \
+    $(call gb_Package_get_target,jvmfwk_javavendors) \
+    $(call gb_Package_get_target,jvmfwk_jreproperties)
+
+endef
+
+define gb_CppunitTest_use_jar
+$(call gb_CppunitTest__use_java_ure,$(1))
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
+
+endef
+
+define gb_CppunitTest_use_jars
+$(foreach jar,$(2),$(call gb_CppunitTest_use_jar,$(1),$(jar)))
+
+endef
+
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest_get_linktarget,$$(1)),$$(2),$$(3),CppunitTest_$$(1))
 
commit 01d8524a6a21b5f0039bff07eee3f040a3ba50ba
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jul 27 13:02:44 2014 +0200

    gbuild: clean target is phony
    
    Change-Id: I39dd1d10f086fd17fd9cf3a511452831a06bf81a

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 726643a..6f82ebe 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -70,6 +70,7 @@ define gb_Jar__command
 endef
 
 # clean target reuses clean target of ClassSet
+.PHONY : $(call gb_Jar_get_clean_target,%)
 $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_Jar_get_classsetname,%))
 	$(call gb_Output_announce,$*,$(false),JAR,3)
 	$(call gb_Helper_abbreviate_dirs,\