feature/gbuild_scp2 is ready for review

[Norbert Thiebaud]

so, building after a make clean yield:
[....]
Multiprocessing build is finished
Maximal number of processes run: 8
Previous HEAD position was 5875f18... make the output more predictable
Switched to branch 'feature/gbuild_scp2'
********************************************************************
*
*   Running the post download checks.
*
********************************************************************
checking build system type... i386-apple-darwin10.8.0
checking host system type... i386-apple-darwin10.8.0
cd icu && unset MAKEFLAGS && /Volumes/TBRAM/core/solenv/bin/build.pl -P8 -- -P8


=============
(1/1) Building module icu
=============
Entering /Volumes/TBRAM/core/icu


Multiprocessing build is finished
Maximal number of processes run: 1
cd icu && /Volumes/TBRAM/core/solenv/bin/deliver.pl
Module 'icu' delivered successfully. 1 files copied, 260 files unchanged
cd scp2 && /opt/lo/bin/make -j 8 -rs gb_PARTIALBUILD=T
/Volumes/TBRAM/core/solver/unxmacxi.pro/inc/pyversion.mk:8: ***
missing separator.  Stop.
make: *** [scp2] Error 2
cannot find new build of scp2


Note: pyversion.mk looks like
cat solver/unxmacxi.pro/inc/pyversion.mk
# 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)

.IF "$(GUI)" == "UNX"
.IF "$(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
.IF "$(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

which is very much dmake like

yet it is used in InstallModule_python.mk

ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
        -DDISABLE_PYUNO \
))
else ifeq ($(SYSTEM_PYTHON),YES)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
        -DSYSTEM_PYTHON \
))
else
include $(OUTDIR)/inc/pyversion.mk
^^^^^ that cannot work with a dmake makefile, especially with
conditional in it !

$(eval $(call gb_InstallModule_add_defs,scp2/python,\
        -DPYVERSION=$(PYVERSION) \
        -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
        -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME) \
))
endif


The attached patch solved that problem for me.
(with a modification of your script to re-build + deliver python when needed)

after that I get
[ build SPP ] scp2/source/ooo/ooo_brand
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:707
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:707
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:707 Bad
token ..) produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:718
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:718
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:718 Bad
token ..) produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:729
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:729
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:729 Bad
token ..) produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:740
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:740
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:740 Bad
token ..) produced by ##
make[1]: *** [/Volumes/TBRAM/core/workdir/unxmacxi.pro/ScpPreprocessTarget/scp2/source/ooo/file_library_ooo.pre]
Error 1
make[1]: *** Deleting file
`/Volumes/TBRAM/core/workdir/unxmacxi.pro/ScpPreprocessTarget/scp2/source/ooo/file_library_ooo.pre'
make[1]: *** Waiting for unfinished jobs....
make: *** [scp2] Error 2
cannot find new build of scp2

I got past that one with
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


Then I get:

[ build IMO ] scp2/ooo
************************************************
WARNING: multiple assignments of gids:
************************************************
		GID: gid_Brand_Dir_Program Assignments: 2
[ build MOD ] scp2
[ build ALL ] top level modules: scp2
[ build ALL ] loaded modules: scp2


These par files only exist in old build:
registryitem_binfilter.par
par test failed: skipping ins test
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-provide-a-gnu-make-compatible-include-for-pyversion.patch
Type: application/octet-stream
Size: 3441 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120520/9f7940b7/attachment.obj>