From 9b30c3e98ebb2f1c74609d93be735daf3b0bf03c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 26 Apr 2013 13:32:08 +0200
Subject: Towards a Mac OS X PythonTest

Use URE_BOOTSTRAP instead of listing ~its content individually.

[DY]LD_LIBRARY_PATH needs to be set to all of installdir's ure and program as
well as OUTDIR, as initPoniesMode (pyuno/source/module/pyuno_module.cxx) tries
to load the OUTDIR test library.  Abstracted as gb_PythonTest_PRECOMMAND.

Abstracted Mac's special LibreOffice.app/Content path as gb_DEVINSTALLROOT,
adapted a number of places accordingly.

Change-Id: I1646615c77dfab342675f84dbb83c579bf16058d
---
 smoketest/CppunitTest_smoketest.mk | 4 ++--
 smoketest/Executable_libtest.mk    | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'smoketest')

diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index ee0d8156c791..f607c069c4c9 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -48,9 +48,9 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
 ))
 
 ifeq ($(OS),MACOSX)
-smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
+smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/MacOS/soffice
 else
-smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/program/soffice
+smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/program/soffice
 endif
 
 $(eval $(call gb_CppunitTest_use_ure,smoketest))
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
index 59ba80be4910..1b0a16a65f2a 100644
--- a/smoketest/Executable_libtest.mk
+++ b/smoketest/Executable_libtest.mk
@@ -27,12 +27,7 @@ $(eval $(call gb_Executable_add_exception_objects,libtest,\
 	smoketest/libtest \
 ))
 
-ifeq ($(OS),MACOSX)
-liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS
-else
-liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/program
-endif
-liblibreoffice_OWN_LD_PATH_DIR := $(liblibreoffice_SOFFICE_INST)/libolib
+liblibreoffice_OWN_LD_PATH_DIR := $(gb_DEVINSTALLROOT)/program/libolib
 liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library_get_linktargetname,libreoffice)
 
 $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
@@ -42,6 +37,6 @@ $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
 run_libtest: $(liblibreoffice_OWN_LD_SO)
 	$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library" \
 	$(call gb_LinkTarget_get_target,Executable/libtest) \
-		$(liblibreoffice_SOFFICE_INST) $(OUTDIR)/bin/smoketestdoc.sxw \
+		$(gb_DEVINSTALLROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \
 
 # vim: set noet sw=4 ts=4:
-- 
cgit