From b5ead44a87ffd72e29524a1efb43b6c581e605b7 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 2 Aug 2014 16:06:44 +0200
Subject: fix python deps for services test

Change-Id: Ia82a735c6075771d5096647905c4722ada1d1d40
---
 postprocess/CppunitTest_services.mk |  6 ++++++
 solenv/gbuild/CppunitTest.mk        | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk
index 647d9eb3f877..4a8c96c88abe 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 1ef9a6144628..a59c2a4aa542 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))
 
-- 
cgit