dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 2 +
postprocess/CppunitTest_services.mk | 16 ++++++++++--
sd/CppunitTest_sd_import_tests.mk | 4 +++
solenv/gbuild/CppunitTest.mk | 34 ++++++++++++++++++++++++++-
solenv/gbuild/Pyuno.mk | 13 +++++++---
solenv/gbuild/TargetLocations.mk | 1
sw/CppunitTest_sw_ooxmlexport.mk | 7 +++++
sw/CppunitTest_sw_ooxmlfieldexport.mk | 4 +++
sw/CppunitTest_sw_ooxmlsdrexport.mk | 5 +++
9 files changed, 78 insertions(+), 8 deletions(-)
New commits:
commit de3ba7c23be2ff224f62eb9348ee6c590c37e27d
Author: David Tardon <dtar...@redhat.com>
Date: Sat Aug 2 16:42:10 2014 +0200
gbuild: more deps for services test
Change-Id: I1d409024be6774b84434e629207ada2b05eb05ea
diff --git a/postprocess/CppunitTest_services.mk
b/postprocess/CppunitTest_services.mk
index 4a8c96c..00ac87f 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -39,6 +39,8 @@ endif
$(eval $(call gb_CppunitTest_use_configuration,services))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,services))
+
ifeq ($(ENABLE_JAVA),TRUE)
$(eval $(call gb_CppunitTest_use_java_ure,services))
@@ -48,6 +50,7 @@ $(eval $(call gb_CppunitTest_use_jars,services,\
endif
$(eval $(call gb_CppunitTest_use_packages,services,\
+ autotextshare_en-US \
instsetoo_native_setup \
))
commit b5ead44a87ffd72e29524a1efb43b6c581e605b7
Author: David Tardon <dtar...@redhat.com>
Date: Sat Aug 2 16:06:44 2014 +0200
fix python deps for services test
Change-Id: Ia82a735c6075771d5096647905c4722ada1d1d40
diff --git a/postprocess/CppunitTest_services.mk
b/postprocess/CppunitTest_services.mk
index 647d9eb..4a8c96c 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_CppunitTest_use_vcl,services))
$(eval $(call gb_CppunitTest_use_rdb,services,services))
ifneq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_CppunitTest_use_python_ure,services))
+
$(eval $(call gb_CppunitTest_use_rdb,services,pyuno))
endif
@@ -45,4 +47,8 @@ $(eval $(call gb_CppunitTest_use_jars,services,\
))
endif
+$(eval $(call gb_CppunitTest_use_packages,services,\
+ instsetoo_native_setup \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1ef9a61..a59c2a4 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -84,6 +84,8 @@ $(call gb_CppunitTest_get_target,%) :|
$(gb_CppunitTest_CPPTESTDEPS)
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(HEADLESS),,VCL_HIDE_WINDOWS=1) \
+ $(if $(strip $(PYTHON_URE)),\
+ PYTHONDONTWRITEBYTECODE=1) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,$(call
gb_CppunitTest_get_linktarget,$*)) \
$(call gb_CppunitTest__make_args) \
@@ -122,6 +124,7 @@ $(call
gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(
$(call gb_CppunitTest_get_target,$(1)) : ARGS :=
$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS :=
$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(false)
+$(call gb_CppunitTest_get_target,$(1)) : PYTHON_URE := $(false)
$(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
$(call gb_CppunitTest_get_target,$(1)) : VCL := $(false)
$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
@@ -292,6 +295,24 @@ $(foreach jar,$(2),$(call
gb_CppunitTest_use_jar,$(1),$(jar)))
endef
+define gb_CppunitTest_use_python_ure
+$(call gb_CppunitTest_get_target,$(1)) : PYTHON_URE := $(true)
+$(call gb_CppunitTest_get_target,$(1)) :\
+ $(call gb_Library_get_target,pythonloader) \
+ $(call gb_Library_get_target,pyuno) \
+ $(if $(filter-out WNT,$(OS)),\
+ $(call gb_Library_get_target,pyuno_wrapper) \
+ ) \
+ $(if $(SYSTEM_PYTHON),, \
+ $(if $(filter MACOSX,$(OS)),\
+ $(call gb_GeneratedPackage_get_target,python3),\
+ $(call gb_Package_get_target,python3) \
+ ) \
+ ) \
+ $(call gb_Package_get_target,pyuno_python_scripts)
+
+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 18d2a0ff95a271d7500a1a3d777e6d7ac7f0d8d7
Author: David Tardon <dtar...@redhat.com>
Date: Sat Aug 2 16:11:44 2014 +0200
gbuild: ensure py files for a component are there
... when the component is used by a unit test.
Change-Id: I5e3b1770c18d8f7dd8166f30f82bbbba1aa72dc1
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 25f8c8f..b9ccb49 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -23,10 +23,13 @@ $(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
touch $@
+$(call gb_Pyuno_get_final_target,%) :
+ touch $@
+
.PHONY : $(call gb_Pyuno_get_clean_target,%)
$(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
- rm -f $(call gb_Pyuno_get_target,$*)
+ rm -f $(call gb_Pyuno_get_target,$*) $(call
gb_Pyuno_get_final_target,$*)
gb_Pyuno_get_packagename = Pyuno/$(1)
@@ -34,12 +37,13 @@ gb_Pyuno_get_packagename = Pyuno/$(1)
define gb_Pyuno_Pyuno
$(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2))
+$(call gb_Pyuno_get_final_target,$(1)) : $(call gb_Pyuno_get_target,$(1))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call
gb_Pyuno_get_packagename,$(1)))
$(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir
$(call gb_Pyuno_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(call gb_Pyuno_get_packagename,$(1)))
-$$(eval $$(call gb_Module_register_target,$(call
gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
+$$(eval $$(call gb_Module_register_target,$(call
gb_Pyuno_get_final_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno,$(call
gb_Pyuno_get_final_target,$(1)))
endef
@@ -59,7 +63,8 @@ gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule:
define gb_Pyuno_set_componentfile_full
$(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4))
-$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
+$(call gb_Pyuno_get_final_target,$(1)) : $(call
gb_ComponentTarget_get_target,$(2))
+$(call gb_ComponentTarget_get_target,$(2)) : $(call gb_Pyuno_get_target,$(1))
$(call gb_Pyuno_get_clean_target,$(1)) : $(call
gb_ComponentTarget_get_clean_target,$(2))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 0157cd3..68b9e16 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -133,6 +133,7 @@ gb_PrecompiledHeader_get_dep_target =
$(WORKDIR)/Dep/PrecompiledHeader/$(gb_Prec
gb_PrecompiledHeader_get_target =
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
gb_PrecompiledHeader_get_timestamp =
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
gb_PropertiesTranslateTarget_get_target =
$(WORKDIR)/PropertiesTranslateTarget/$(1).properties
+gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb
commit 00daa1f560676ed15583f0a4353e7be18a917f91
Author: David Tardon <dtar...@redhat.com>
Date: Sat Aug 2 15:12:15 2014 +0200
fix java deps for services test
Change-Id: Ifa7a67862fca71dfd96dc55eec9f065f303d88a9
diff --git a/postprocess/CppunitTest_services.mk
b/postprocess/CppunitTest_services.mk
index 08c860e..647d9eb 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -38,9 +38,10 @@ endif
$(eval $(call gb_CppunitTest_use_configuration,services))
ifeq ($(ENABLE_JAVA),TRUE)
-$(call gb_CppunitTest_get_target,services): $(call gb_Jar_get_target,unoil)
-$(eval $(call gb_CppunitTest_add_arguments,services, \
- -env:URE_MORE_JAVA_TYPES=$(call gb_Helper_make_url,$(call
gb_Jar_get_target,unoil)) \
+$(eval $(call gb_CppunitTest_use_java_ure,services))
+
+$(eval $(call gb_CppunitTest_use_jars,services,\
+ smoketest \
))
endif
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 4f4993f..1ef9a61 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -52,6 +52,8 @@ $(if $(URE),\
"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call
gb_Helper_make_url,$(item)))") \
$(if $(strip $(UNO_SERVICES)),\
"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call
gb_Helper_make_url,$(item)))") \
+ $(if $(strip $(JAVA_URE)),\
+ -env:URE_MORE_JAVA_TYPES=$(call gb_Helper_make_url,$(call
gb_Jar_get_target,unoil))) \
-env:URE_INTERNAL_LIB_DIR=$(call
gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
-env:LO_LIB_DIR=$(call
gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER)) \
-env:LO_JAVA_DIR=$(call
gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)) \
@@ -119,6 +121,7 @@ $(call gb_CppunitTest_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_ta
$(call
gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call
gb_CppunitTest_get_ilibfilename,$(1)))
$(call gb_CppunitTest_get_target,$(1)) : ARGS :=
$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS :=
+$(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(false)
$(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
$(call gb_CppunitTest_get_target,$(1)) : VCL := $(false)
$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
@@ -262,9 +265,17 @@ $(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)) : JAVA_URE := $(true)
$(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_Library_get_target,java_uno) \
+ $(call gb_Library_get_target,jpipe) \
+ $(call gb_Library_get_target,juhx) \
+ $(call gb_Library_get_target,juhx) \
+ $(call gb_Library_get_target,jvmaccess) \
+ $(call gb_Library_get_target,jvmfwk) \
+ $(call gb_Library_get_target,sunjavaplugin) \
$(call gb_Package_get_target,jvmfwk_javavendors) \
$(call gb_Package_get_target,jvmfwk_jreproperties)
commit 1f6e670605cc856a6e9febb024f9cb2427156020
Author: David Tardon <dtar...@redhat.com>
Date: Sat Aug 2 15:08:52 2014 +0200
gbuild: require java UNO runtime explicitly
Change-Id: I83e468a729ef72b74c2718fe98dd3998dac6c21e
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 0dd08cb..07a96ec 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\
$(eval $(call gb_CppunitTest_use_ure,dbaccess_hsqldb_test))
$(eval $(call gb_CppunitTest_use_vcl,dbaccess_hsqldb_test))
+$(eval $(call gb_CppunitTest_use_java_ure,dbaccess_hsqldb_test))
+
$(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
basic/util/sb \
comphelper/util/comphelp \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 137adca..4f4993f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -261,7 +261,7 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call
gb_Executable_get_target,$(2))
endef
-define gb_CppunitTest__use_java_ure
+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) \
commit 485216a9da423361e75c94a49b24600e29e70978
Author: David Tardon <dtar...@redhat.com>
Date: Fri Aug 1 23:57:48 2014 +0200
fix deps for sd_import_tests
Change-Id: Ica864f8fc654df3dfeb83850ede43473904de261
diff --git a/sd/CppunitTest_sd_import_tests.mk
b/sd/CppunitTest_sd_import_tests.mk
index e4801ac..e065850 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -114,6 +114,10 @@ $(eval $(call
gb_CppunitTest_add_arguments,sd_import_tests,\
"-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
))
+$(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\
+ oox_customshapes \
+))
+
$(call gb_CppunitTest_get_target,sd_import_tests) : $(call
gb_AllLangResTarget_get_target,sd)
# vim: set noet sw=4 ts=4:
commit 6520c07048c2e04b48012bb7637f7ad3d22ca059
Author: David Tardon <dtar...@redhat.com>
Date: Fri Aug 1 23:27:46 2014 +0200
fix deps for sw_ooxmlsdrexport test
Change-Id: If4449a022f5474b9f73c3c91d75e1975458236dc
diff --git a/sw/CppunitTest_sw_ooxmlsdrexport.mk
b/sw/CppunitTest_sw_ooxmlsdrexport.mk
index 4907b2f..a5e25fc 100644
--- a/sw/CppunitTest_sw_ooxmlsdrexport.mk
+++ b/sw/CppunitTest_sw_ooxmlsdrexport.mk
@@ -50,4 +50,9 @@ $(eval $(call
gb_CppunitTest_use_configuration,sw_ooxmlsdrexport))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlsdrexport))
+$(eval $(call gb_CppunitTest_use_packages,sw_ooxmlsdrexport,\
+ oox_customshapes \
+ oox_generated \
+))
+
# vim: set noet sw=4 ts=4:
commit 2dd7097a101e2b4e1e1033a776fc6b1e7c8fb5d9
Author: David Tardon <dtar...@redhat.com>
Date: Fri Aug 1 23:00:33 2014 +0200
fix deps for sw_ooxmlfieldexport test
Change-Id: I75e1b88e6e030eadfa87c56a499fd72e40d05c0a
diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk
b/sw/CppunitTest_sw_ooxmlfieldexport.mk
index 9e0171e..31a77f9 100644
--- a/sw/CppunitTest_sw_ooxmlfieldexport.mk
+++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk
@@ -50,4 +50,8 @@ $(eval $(call
gb_CppunitTest_use_configuration,sw_ooxmlfieldexport))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlfieldexport))
+$(eval $(call gb_CppunitTest_use_packages,sw_ooxmlfieldexport,\
+ oox_generated \
+))
+
# vim: set noet sw=4 ts=4:
commit 094f440646ce923a437749cf546c247f81b392bf
Author: David Tardon <dtar...@redhat.com>
Date: Fri Aug 1 22:34:08 2014 +0200
fix deps for sw_ooxmlexport test
Change-Id: I27f029ae68cad37c036fb048c7c19d39949f779e
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index 369f1ae..1d30e31 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -50,4 +50,11 @@ $(eval $(call
gb_CppunitTest_use_configuration,sw_ooxmlexport))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport))
+$(eval $(call gb_CppunitTest_use_packages,sw_ooxmlexport,\
+ oox_customshapes \
+ oox_generated \
+))
+
+$(call gb_CppunitTest_get_target,sw_ooxmlexport) : $(call
gb_Library_get_target,iti)
+
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
