Repository.mk | 4 -
connectivity/Library_dbtools.mk | 16 +------
connectivity/Library_macab1.mk | 6 ++
connectivity/Library_macabdrv1.mk | 6 ++
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2
connectivity/source/parse/sqlbison.y | 4 -
python/makefile.mk | 7 ++-
python/prj/d.lst | 1
python/pyversion.Makefile | 25 +++++++++++
scp2/InstallModule_python.mk | 2
10 files changed, 54 insertions(+), 19 deletions(-)
New commits:
commit d11f9ad127b40fb9ab4fe7cf87895f5517087763
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 25 20:41:31 2012 -0500
fix Layer for macab* to please Mac Build
Change-Id: Ie5b833e3aaf3a69d42c8e8024f19be2d13c86be4
diff --git a/Repository.mk b/Repository.mk
index b2c5e54..8ab0416 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -304,8 +304,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lnth \
log \
lwpft \
- macab1 \
- macabdrv1 \
MacOSXSpell \
merged \
mozab2 \
@@ -432,6 +430,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_es \
localedata_euro \
localedata_others \
+ macab1 \
+ macabdrv1 \
mcnttype \
mozbootstrap \
officebean \
commit 9e5e42147e9e9b3bfe803e8b6e6a48f457e0e5f1
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 25 19:58:43 2012 -0500
scp2: rebase mishap.. icuversion.mk is no more
Change-Id: Ie3fe45fce1e27332c178596ed7f60967781ffcda
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 79bb780..927c4e1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,10 +177,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
-ifneq ($(SYSTEM_ICU),YES)
-include $(OUTDIR)/inc/icuversion.mk
-endif
-
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
commit 4e72089c1a6bc59e5f39c1d22a317267363b31b1
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 25 18:27:50 2012 -0500
connectivity: Mac use bison 2.3 which need a '=' for %file-prefix
Change-Id: I87c2b301739946163c4b5cecf04e30ed6f137e67
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 536cfc9..b170956 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,5 +1,5 @@
-%file-prefix "sql"
-%name-prefix "SQLyy"
+%file-prefix="sql"
+%name-prefix="SQLyy"
%no-lines
%defines
commit 582314f43413ebc9ef06852ac33bca0ed725bbe1
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 25 18:27:04 2012 -0500
connectivity: use gbuild api for flex (this hide a -Werror problem on Mac)
Change-Id: I7b5551932db6e3e6037ad4f98ed77a29b4dec5db
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 33de116..3336815 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -79,22 +79,14 @@ $(eval $(call gb_Library_add_noexception_objects,dbtools,\
$(eval $(call gb_Library_add_grammars,dbtools,\
connectivity/source/parse/sqlbison \
))
-
-$(SRCDIR)/connectivity/source/parse/sqlflex.l: $(call
gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)
-$(WORKDIR)/CustomTarget/connectivity/sqlflex.cxx:
$(SRCDIR)/connectivity/source/parse/sqlflex.l
- mkdir -p $(dir $@)
- flex -i -8 -PSQLyy -L -o$@ $<
+$(eval $(call gb_Library_add_scanners,dbtools,\
+connectivity/source/parse/sqlflex \
+))
-$(call gb_Library_get_clean_target,dbtools): dbtools_flex_clean
+$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) :
T_LEXFLAGS := -i -8 -PSQLyy -L
-.PHONY: dbtools_flex_clean
-dbtools_flex_clean:
- rm -rf $(WORKDIR)/CustomTarget/connectivity
-$(eval $(call gb_Library_add_generated_exception_objects,dbtools,\
- CustomTarget/connectivity/sqlflex \
-))
$(eval $(call gb_Library_add_exception_objects,dbtools,\
connectivity/source/commontools/predicateinput \
commit ce9bda875db2bc35436f24e3db0fe89a9ff765af
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 25 18:25:36 2012 -0500
WaE unused variable
Change-Id: I9545097bd69928f608dd34d5729a6053be3114d1
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index c3eebc8..d4fa119 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -79,7 +79,7 @@ void MacabResultSetMetaData::setMacabFields(const
::rtl::Reference<connectivity:
}
// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32
column) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /*
column */) throw(SQLException, RuntimeException)
{
// For now, all columns are the same size.
return 50;
commit 7f751dc856cb951503ec9a680ddbcdf3b2240ead
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri May 25 18:16:38 2012 -0500
connectivity: missing include in gbuildification
Change-Id: I3180537cf379976659e93d93eb707ca87ae13735
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index d8d87c2..cf5168c 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -43,6 +43,12 @@ $(eval $(call gb_Library_use_libraries,macab1,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_set_include,macab1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
$(eval $(call gb_Library_add_exception_objects,macab1,\
connectivity/source/drivers/macab/MacabDriver \
connectivity/source/drivers/macab/MacabServices \
diff --git a/connectivity/Library_macabdrv1.mk
b/connectivity/Library_macabdrv1.mk
index fde08dc..0f15bb4 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -47,6 +47,12 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_set_include,macabdrv1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
$(eval $(call gb_Library_add_exception_objects,macabdrv1,\
connectivity/source/drivers/macab/MacabColumns \
connectivity/source/drivers/macab/MacabTable \
commit 45d290ba1fb12249f9ee22668ad771017938fe67
Author: David Tardon <dtar...@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 927c4e1..79bb780 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,6 +177,10 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
+ifneq ($(SYSTEM_ICU),YES)
+include $(OUTDIR)/inc/icuversion.mk
+endif
+
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
commit 513b10079fa43f594f42a88e11beb3fa54403565
Author: Norbert Thiebaud <nthieb...@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 1abe100..087a513 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -172,6 +172,7 @@ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe
pcbuild.sln "$(CONF)|$(ARCH)"
.ENDIF
PYVERSIONFILE=$(MISC)$/pyversion.mk
+PYVERSIONGFILE=$(MISC)$/pyversion.Makefile
# --- Targets ------------------------------------------------------
@@ -207,7 +208,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
@@ -252,4 +253,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) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
