[Libreoffice-commits] .: 3 commits - clucene/prj solenv/gbuild

[Matus Kukan]

 clucene/prj/build.lst          |    6 +++---
 solenv/gbuild/gbuild_simple.mk |   18 ++++++++++++++++++
 solenv/gbuild/partial_build.mk |    2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 7e454a3e3dc7f7f85a623ab6a7afab6f40bccaa6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Feb 24 23:34:58 2012 +0100

    gbuild_simple: add gb_Python and include also Tempfile here

diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 3f7ba29..b05cb8c 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -77,8 +77,26 @@ gb_SYMBOL := $(true)
 endif
 
 include $(GBUILDDIR)/Helper.mk
+include $(GBUILDDIR)/Tempfile.mk
 
 # Include platform/cpu/compiler specific config/definitions
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
+ifeq ($(SYSTEM_PYTHON),YES)
+gb_PYTHONTARGET :=
+gb_PYTHON := $(PYTHON)
+else ifeq ($(OS),MACOSX)
+#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in
+#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME
+#dirs for in-tree internal python
+gb_PYTHONTARGET :=
+gb_PYTHON := $(PYTHON)
+else ifeq ($(DISABLE_PYTHON),TRUE)
+# Build-time python
+gb_PYTHON := python
+else
+gb_PYTHONTARGET := $(OUTDIR)/bin/python
+gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
+endif
+
 # vim: set noet sw=4 ts=4:
commit 66fdc38fb71e69669d09ff2f05656e5d654d4975
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Feb 24 23:31:50 2012 +0100

    partial_build: make this work also for modules from clone/

diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index ddfbc47..4a390fc 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -5,7 +5,7 @@ ifeq ($(SOLARENV),)
 ifeq ($(gb_Side),)
 gb_Side:=host
 endif
-include $(module_directory)/../config_$(gb_Side).mk
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk
 endif
 
 include $(SOLARENV)/gbuild/gbuild.mk
commit 48dc8ca4e1784dd6ebec1ab58a3a32651780afc7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Feb 24 23:30:11 2012 +0100

    make this consistent

diff --git a/clucene/prj/build.lst b/clucene/prj/build.lst
index ef04681..c33dcb2 100644
--- a/clucene/prj/build.lst
+++ b/clucene/prj/build.lst
@@ -1,3 +1,3 @@
-cl	cl : ZLIB:zlib BOOST:boost NULL
-cl	cl				usr1	-   all	cl_mkout NULL
-cl	cl\prj				nmake	-   all	cl_prj NULL
+cl	clucene : ZLIB:zlib BOOST:boost NULL
+cl	clucene			usr1	-   all	cl_mkout NULL
+cl	clucene\prj		nmake	-   all	cl_prj NULL