[Libreoffice-commits] .: Branch 'integration/dev300_m101' - solenv/gbuild

[Michael Meeks]

 solenv/gbuild/Helper.mk           |    9 ++++++++-
 solenv/gbuild/platform/linux.mk   |    1 +
 solenv/gbuild/platform/macosx.mk  |    2 ++
 solenv/gbuild/platform/windows.mk |    1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 4fbace542bbc8f5e1b1ade4bef311ac69a194843
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Mar 17 13:51:59 2011 +0000

    add helper to set-up the libraries env, to run executable during build
    
    Conflicts:
    
    	solenv/gbuild/Helper.mk
    	solenv/gbuild/platform/linux.mk
    	solenv/gbuild/platform/windows.mk

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index d16c7cd..dace867 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,4 +165,11 @@ gb_StaticLibrary_$(1) += $(2)
 
 endef
 
-# vim: set noet sw=4:
+define gb_Helper_execute
+$(call gb_Helper_set_ld_path) $(OUTDIR)/bin/$(1)
+endef
+
+export gb_Helper_set_ld_path
+export gb_Helper_execute
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 231111e..3a708b7 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -153,6 +153,7 @@ gb_COMPILERNOOPTFLAGS := -O0
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR)/lib
 
 # CObject class
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f6f3d9c..4490d82 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -142,6 +142,8 @@ gb_COMPILERNOOPTFLAGS := -O0
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
 
 # CObject class
 
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a68d369..3795343 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -226,6 +226,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
 endef
 
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
 # CObject class