[Libreoffice-commits] .: Branch 'feature/gbuild_scp2' - 3 commits - python/makefile.mk python/prj python/pyversion.Makefile scp2/InstallModule_binfilter.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk

[David Tardon]

 python/makefile.mk              |    7 ++++++-
 python/prj/d.lst                |    1 +
 python/pyversion.Makefile       |   25 +++++++++++++++++++++++++
 scp2/InstallModule_binfilter.mk |    4 +---
 scp2/InstallModule_ooo.mk       |    2 +-
 scp2/InstallModule_python.mk    |    2 +-
 6 files changed, 35 insertions(+), 6 deletions(-)

New commits:
commit a8fd7137e2ef671fbd3ebc613760cbe49d13a6c6
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 20 18:40:45 2012 +0200

    temporarily build registryitem_binfiler on all platforms
    
    The old build system did this, probably by a mistake, so this is to make
    testing easier.
    
    Change-Id: I31e42c6b3b0ed76163c6aa51e57db1534367e3db

diff --git a/scp2/InstallModule_binfilter.mk b/scp2/InstallModule_binfilter.mk
index 432ab46..a151ba5 100644
--- a/scp2/InstallModule_binfilter.mk
+++ b/scp2/InstallModule_binfilter.mk
@@ -38,9 +38,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/binfilter,\
 
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/binfilter,\
     scp2/source/binfilter/module_binfilter \
-	$(if $(filter WNT,$(GUI)),\
-		scp2/source/binfilter/registryitem_binfilter \
-	) \
+	scp2/source/binfilter/registryitem_binfilter \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit 87f63318d858aaa81836a8406d23a77442973c0f
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 20 17:50:22 2012 +0200

    fix copy-and-paste bug
    
    Change-Id: I236165572652d7740d637ac19994aca549f501bb

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 81653a0..79bb780 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,7 +177,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif
 
-ifneq ($(SYSTEM_LIBXSLT),YES)
+ifneq ($(SYSTEM_ICU),YES)
 include $(OUTDIR)/inc/icuversion.mk
 endif
 
commit 6c41369f091dda0f7dea41faad0ca5e10f5e0c10
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun May 20 09:11:40 2012 -0500

    provide a gnu-make compatible include for pyversion
    
    Change-Id: I I7d0de9bc04c26e71c6bd915a659a15c3e1f712d2

diff --git a/python/makefile.mk b/python/makefile.mk
index 5043b28..42264b1 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -171,6 +171,7 @@ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "$(CONF)|$(ARCH)"
 .ENDIF
 
 PYVERSIONFILE=$(MISC)$/pyversion.mk
+PYVERSIONGFILE=$(MISC)$/pyversion.Makefile
 
 # --- Targets ------------------------------------------------------
 
@@ -206,7 +207,7 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h
 .ENDIF
 .ENDIF
 
-ALLTAR : $(PYVERSIONFILE)
+ALLTAR : $(PYVERSIONFILE) $(PYVERSIONGFILE)
 .ENDIF          # "$(L10N_framework)"==""
 
 # rule to allow relocating the whole framework, removing reference to buildinstallation directory
@@ -251,4 +252,8 @@ $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 	@-rm -f $@
 	$(COMMAND_ECHO)$(COPY) pyversion.mk $@
 
+$(PYVERSIONGFILE) : pyversion.Makefile $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+	@-rm -f $@
+	$(COMMAND_ECHO)$(COPY) pyversion.Makefile $@
+
 .ENDIF # DISABLE_PYTHON != TRUE
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 4fb4405..0c936ab 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -8,6 +8,7 @@ mkdir: %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6
 # MACOSX - end
 
 ..\%__SRC%\misc\pyversion.mk %_DEST%\inc\pyversion.mk
+..\%__SRC%\misc\pyversion.Makefile %_DEST%\inc\pyversion.Makefile
 
 mkdir: %_DEST%\lib\python
 mkdir: %_DEST%\lib\python\lib-old
diff --git a/python/pyversion.Makefile b/python/pyversion.Makefile
new file mode 100644
index 0000000..4b4be9c
--- /dev/null
+++ b/python/pyversion.Makefile
@@ -0,0 +1,25 @@
+# when you want to change the python version, you must update the d.lst
+# in the python project accordingly !!!
+PYMAJOR:=2
+PYMINOR:=6
+PYMICRO:=1
+PYVERSION:=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
+
+ifeq ($(GUI),UNX)
+ifeq ($(OS),MACOSX)
+PY_FULL_DLL_NAME:=libpython$(PYMAJOR).$(PYMINOR).a
+PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython
+CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR)
+else
+PY_FULL_DLL_NAME:=libpython$(PYMAJOR).$(PYMINOR).so.1.0
+PYTHONLIB:=-lpython$(PYMAJOR).$(PYMINOR)
+endif
+else
+ifeq ($(COM),GCC)
+PY_FULL_DLL_NAME:=libpython$(PYMAJOR).$(PYMINOR).dll
+PYTHONLIB:=-lpython$(PYMAJOR).$(PYMINOR)
+else
+PY_FULL_DLL_NAME:=python$(PYMAJOR)$(PYMINOR).dll
+PYTHONLIB:=python$(PYMAJOR)$(PYMINOR).lib
+endif
+endif
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 774775d..53d0891 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 	-DSYSTEM_PYTHON \
 ))
 else
-include $(OUTDIR)/inc/pyversion.mk
+include $(OUTDIR)/inc/pyversion.Makefile
 
 $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 	-DPYVERSION=$(PYVERSION) \