solenv/gbuild/CppunitTest.mk | 2 +- solenv/gbuild/platform/ios.mk | 1 + solenv/gbuild/platform/macosx.mk | 1 + solenv/gbuild/platform/solaris.mk | 1 + solenv/gbuild/platform/unxgcc.mk | 1 + solenv/gbuild/platform/windows.mk | 1 + 6 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit 848bb3202cecd63926c468191eeb2c108ada4538 Merge: 2b9e302... 8bd171e... Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Fri Sep 30 11:28:32 2011 +0200 Merge branch 'master' of /home/bjoern/.jenkins/jobs/repo-mirror/workspace/core commit 2b9e302f0aee867412fa45275d42cb68929fb4b5 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Fri Sep 30 11:24:21 2011 +0200 keep platform stuff in the platform subdir diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e2010d5..a463b76 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -72,7 +72,7 @@ $(if $(strip $(UNO_SERVICES)),\ $(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \ $(if $(URE),\ $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\ - -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib))) + -env:$(dir)=file://$(gb_CppunitTest_LIBDIR))) endef .PHONY : $(call gb_CppunitTest_get_clean_target,%) diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index e9653ed..e5a398f 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -381,6 +381,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := : gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib +gb_CppunitTest_EXT := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 01ff9d0..6e72767 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -469,6 +469,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib +gb_CppunitTest_LIBDIR := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 313dae8..ad7c5cc 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -344,6 +344,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .so +gb_CppunitTest_LIBDIR := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index f1c1989..2317fc0 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -455,6 +455,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .so +gb_CppunitTest_LIBDIR := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index e91d5b0..873c6fb 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -601,6 +601,7 @@ gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}" gb_CppunitTest_SYSPRE := itest_ gb_CppunitTest_EXT := .lib +gb_CppunitTest_LIBDIR := $(OUTDIR)/bin gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = test_$(1).dll _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits