[Libreoffice-commits] .: 2 commits - filter/source solenv/gbuild

[Caolán McNamara]

 filter/source/svg/Makefile         |    4 ++--
 solenv/gbuild/gbuild.mk            |    2 +-
 solenv/gbuild/platform/ios.mk      |    3 +++
 solenv/gbuild/platform/macosx.mk   |    3 +++
 solenv/gbuild/platform/solaris.mk  |    3 +++
 solenv/gbuild/platform/unxgcc.mk   |    3 +++
 solenv/gbuild/platform/windows.mk  |    3 +++
 solenv/gbuild/platform/winmingw.mk |    3 +++
 8 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 257bcb1a1140d3e070cfaef6fec0704740bc83b8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 16 14:10:33 2011 +0100

    get internal python invocations working

diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
index 9ca86f1..bd0e85e 100644
--- a/filter/source/svg/Makefile
+++ b/filter/source/svg/Makefile
@@ -60,7 +60,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
 $(filter_GEN_svg_Script_hxx) : \
 			$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx)
 	$(call gb_Output_announce,$@,build,PY ,1)
-	$(call gb_Helper_abbreviate_dirs, \
+	$(call gb_Helper_abbreviate_dirs_native, \
 		$(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \
 			$(filter_SRC_svg_PresentationEngine) \
 			$(filter_GEN_svg_Script_hxx))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6169cdc..eb708ca 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -334,7 +334,7 @@ gb_PYTHONTARGET :=
 gb_PYTHON := $(PYTHON)
 else
 gb_PYTHONTARGET := $(OUTDIR)/bin/python
-gb_PYTHON := $(gb_PYTHON_PRECOMMAND) PYTHONPATH=$(SOLARLIBDIR)/python $(gb_PYTHONTARGET)
+gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
 endif
 
 export gb_AWK
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 7c2e707..f9c903c 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -447,4 +447,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLA
 # Configuration
 gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
+# Python
+gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 51e4256..f71c5af 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -532,4 +532,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
 # Configuration
 gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
+# Python
+gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 55f2f1f..010a6b5 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -418,4 +418,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU
 # Configuration
 gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 
+# Python
+gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 362b378..f142e4a 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -504,4 +504,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU
 # Configuration
 gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 
+# Python
+gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index f51bce6..203ed81 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -761,4 +761,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_RE
 # Configuration
 gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
 
+# Python
+gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index d5cdb3e..18d71bd 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -685,4 +685,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_
 # Configuration
 gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
 
+# Python
+gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
+
 # vim: set noet sw=4:
commit 6c6d88b8d0bb22e79ed91b549d255d9a3652b727
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 16 13:37:37 2011 +0100

    need to include gbuild.mk not gbuild_simple.mk for gb_PYTHON

diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
index 5ccd632..9ca86f1 100644
--- a/filter/source/svg/Makefile
+++ b/filter/source/svg/Makefile
@@ -28,7 +28,7 @@
 SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 WORKDIR_FILTER := .
 
-include $(GBUILDDIR)/gbuild_simple.mk
+include $(GBUILDDIR)/gbuild.mk
 
 filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
 filter_SRC_svg_GenToken := $(SRCDIR_FILTER)/gentoken.pl