[Libreoffice-commits] .: 4 commits - configure.ac dbaccess/Library_dbu.mk filter/prj Makefile.top pyuno/Library_pyuno_wrapper.mk pyuno/prj pyuno/zipcore RepositoryExternal.mk scp2/InstallModule_python.mk scp2/prj scp2/source solenv/bin sw/source tail_build/prj

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 27 03:50:28 PST 2012


 Makefile.top                              |    1 
 RepositoryExternal.mk                     |   14 +-
 configure.ac                              |    6 
 dbaccess/Library_dbu.mk                   |    7 -
 filter/prj/build.lst                      |    2 
 pyuno/Library_pyuno_wrapper.mk            |    4 
 pyuno/prj/build.lst                       |    2 
 pyuno/zipcore/python.sh                   |    4 
 scp2/InstallModule_python.mk              |    1 
 scp2/prj/build.lst                        |    2 
 scp2/source/python/file_python.scp        |  185 ++++++++++++++++++------------
 scp2/source/python/module_python.scp      |   18 +-
 scp2/source/python/profileitem_python.scp |    4 
 solenv/bin/macosx-dylib-link-list.pl      |    3 
 sw/source/ui/dialog/wordcountdialog.cxx   |    2 
 tail_build/prj/build.lst                  |    2 
 16 files changed, 158 insertions(+), 99 deletions(-)

New commits:
commit 602b746330d21ae1b9c0fc60eb0980ed92cd5680
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 26 23:06:29 2012 +0100

    configure: switch system Python minimum to 3.3
    
    System Python 2 can still be used by setting PYTHON, PYTHON_CFLAGS,
    PYTHON_LIBS manually.
    
    Change-Id: I4c2eccad3866ae2b037752e9e06768c444e0aa9a

diff --git a/configure.ac b/configure.ac
index cb8a760..c0dc0ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7377,11 +7377,11 @@ else
             PYTHON_LIBS="-framework Python"
         else
             # This causes an error if no python command is found
-            AM_PATH_PYTHON([2.6])
+            AM_PATH_PYTHON([3.3])
         fi
     elif test $enable_python = auto; then
         dnl This allows lack of system Python
-        AM_PATH_PYTHON([2.6],, [:])
+        AM_PATH_PYTHON([3.3],, [:])
 
         if test "$PYTHON" = :; then
             enable_python=internal
commit 38a22a9026a3d8a67f3e16ec650960a10b527d25
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Nov 17 00:35:35 2012 +0100

    Switch from python to python3
    
    Mac specific parts of patch by:
    Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    
    Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f

diff --git a/Makefile.top b/Makefile.top
index 44e191c..283128e 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -140,6 +140,7 @@ packimages\
 padmin\
 postgresql\
 psprint_config\
+python3 \
 pyuno\
 qadevOOo\
 readlicense_oo\
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b541733..2890d9a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1966,27 +1966,31 @@ define gb_LinkTarget__use_python
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
-    python26.lib \
+    python33.lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
-    -F$(OUTDIR)/lib -framework OOoPython \
+    -dylib_file @loader_path/LibreOfficePython.framework/Versions/3.3/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython \
+    -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \
 )
 else
 $(call gb_LinkTarget_use_libraries,$(1),\
-    python2.6 \
+    python3.3m \
 )
 endif
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(OUTDIR)/inc/python \
+	-I$(call gb_UnpackedTarball_get_dir,python3) \
+	-I$(call gb_UnpackedTarball_get_dir,python3)/PC \
+	-I$(call gb_UnpackedTarball_get_dir,python3)/Include \
 	$$(INCLUDE) \
 )
 
 endef
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	python2.6 \
+	python3 \
+	python3.3m \
 ))
 
 endif # SYSTEM_PYTHON
diff --git a/configure.ac b/configure.ac
index 061175e..cb8a760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7468,7 +7468,7 @@ int main(int argc, char **argv) {
 
 internal)
     SYSTEM_PYTHON=NO
-    PYTHON_TARBALL="e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2"
+    PYTHON_TARBALL="b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2"
     BUILD_TYPE="$BUILD_TYPE PYTHON"
     # Embedded Python dies without Home set
     if test "$HOME" = ""; then
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 1ed611d..13cabe0 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,2 +1,2 @@
-fl      filter  :    svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas LIBXSLT:libxslt basegfx package PYTHON:python NULL
+fl      filter  :    svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas LIBXSLT:libxslt basegfx package PYTHON:python3 NULL
 fl  filter\prj nmake - all fl_prj   NULL
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index 2c44a6f..5e06ad4 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -48,7 +48,9 @@ $(eval $(call gb_Library_set_include,pyuno_wrapper,\
 ))
 else
 $(eval $(call gb_Library_set_include,pyuno_wrapper,\
-    -I$(OUTDIR)/inc/python \
+	-I$(call gb_UnpackedTarball_get_dir,python3) \
+	-I$(call gb_UnpackedTarball_get_dir,python3)/PC \
+	-I$(call gb_UnpackedTarball_get_dir,python3)/Include \
     $$(INCLUDE) \
 ))
 endif
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index ca0bce9..863fca6 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,3 +1,3 @@
-bgpu  pyuno : salhelper stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
+bgpu  pyuno : salhelper stoc cpputools cppuhelper bridges tools PYTHON:python3 LIBXSLT:libxslt NULL
 pu    pyuno   		     	       		  	  		usr1 - all br_mkout NULL
 pu    pyuno\prj 							nmake - all pu_prj NULL
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index 5bb9886..c232c99 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -57,7 +57,7 @@ export PYTHONHOME
 # execute binary
 exec "$sd_prog/python.bin" "$@"
 MACSECTION
-PYTHONHOME=$sd_prog/OOoPython.framework
+PYTHONHOME=$sd_prog/LibreOfficePython.framework
 export PYTHONHOME
 
 pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%%
@@ -65,4 +65,4 @@ PYTHONPATH=$sd_prog:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib
 export PYTHONPATH
 
 # execute binary
-exec "$PYTHONHOME/Versions/%%PYVERSION%%/Resources/Python.app/Contents/MacOS/OOoPython" "$@"
+exec "$PYTHONHOME/Versions/%%PYVERSION%%/Resources/Python.app/Contents/MacOS/LibreOfficePython" "$@"
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 32516b3..6e2c6d0 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -50,6 +50,7 @@ include $(OUTDIR)/inc/pyversion.Makefile
 $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 	-DPYVERSION=$(PYVERSION) \
 	-DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
+	-DPYMAJOR=$(PYMAJOR) \
 	-DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME) \
 ))
 endif
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 19b2e96..b6a6b2e 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,3 +1,3 @@
-cp    scp2    :    i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    i18npool DESKTOP:l10ntools PYTHON:python3 ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\prj                    nmake    -    all    cp_prj NULL
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 305a3e6..fc4db23 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -96,7 +96,7 @@ File gid_File_Py_Python_Core
     TXT_FILE_BODY;
   #ifdef MACOSX
     Dir = gid_Brand_Dir_Program;
-    Name = "OOoPython.framework.zip";
+    Name = "LibreOfficePython.framework.zip";
     Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
   #else
     Dir = gid_Dir_Py_PythonCore_Lib;
@@ -153,35 +153,21 @@ File gid_File_Lib_Python_So
     Name = STRING(PY_FULL_DLL_NAME);
     Styles = (PACKED);
 End
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Python_So
-    FileID = gid_File_Lib_Python_So;
+File gid_File_Lib_Python3_So
+    LIB_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
+#ifdef UNX
+    Name = STRING(CONCAT3(libpython,PYMAJOR,UNXSUFFIX));
+#else // WNT
+    Name = STRING(CONCAT3(python,PYMAJOR,.dll));
 #endif //UNX
+    Styles = (PACKED);
+End
 #else //MACOSX
 //directory entries solely to be able to create the symlinks
 Directory gid_Dir_PythonFramework
     ParentID = gid_Brand_Dir_Program;
-    HostName = "OOoPython.framework";
-End
-
-Unixlink gid_Unixlink_Python_Headers
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework;
-    Name = "Headers";
-    Target = "Versions/Current/Headers";
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Resources
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework;
-    Name = "Resources";
-    Target = "Versions/Current/Resources";
-    Styles = ();
+    HostName = "LibreOfficePython.framework";
 End
 
 Directory gid_Dir_PythonFramework_Versions
@@ -189,27 +175,11 @@ Directory gid_Dir_PythonFramework_Versions
     HostName = "Versions";
 End
 
-Unixlink gid_Unixlink_Python_Versions_Current
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions;
-    Name = "Current";
-    Target = STRING(PYMAJMIN);
-    Styles = ();
-End
-
 Directory gid_Dir_PythonFramework_Versions_ver
     ParentID = gid_Dir_PythonFramework_Versions;
     HostName = STRING(PYMAJMIN);
 End
 
-Unixlink gid_Unixlink_Python_Versions_ver_Headers
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver;
-    Name = "Headers";
-    Target = STRING(CONCAT2(include/python,PYMAJMIN));
-    Styles = ();
-End
-
 Directory gid_Dir_PythonFramework_Versions_ver_bin
     ParentID = gid_Dir_PythonFramework_Versions_ver;
     HostName = "bin";
@@ -220,6 +190,11 @@ Directory gid_Dir_PythonFramework_Versions_ver_lib
     HostName = "lib";
 End
 
+Directory gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig
+    ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
+    HostName = "pkgconfig";
+End
+
 Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
     ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
     HostName = STRING(CONCAT2(python,PYMAJMIN));
@@ -227,45 +202,69 @@ End
 
 Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
     ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
-    HostName = "config";
+    HostName = STRING(CONCAT3(config-,PYMAJMIN,m));
 End
 
-Unixlink gid_Unixlink_Python_OOoPython
+Unixlink gid_Unixlink_Python_Headers
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework;
-    Name = "OOoPython";
-    Target = "Versions/Current/OOoPython";
+    Name = "Headers";
+    Target = "Versions/Current/Headers";
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_bin_idle
+Unixlink gid_Unixlink_Python_LibreOfficePython
     BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "idle";
-    Target = STRING(CONCAT2(idle,PYMAJMIN));
+    Dir = gid_Dir_PythonFramework;
+    Name = "LibreOfficePython";
+    Target = "Versions/Current/LibreOfficePython";
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_bin_pydoc
+Unixlink gid_Unixlink_Python_Resources
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework;
+    Name = "Resources";
+    Target = "Versions/Current/Resources";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_Versions_Current
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions;
+    Name = "Current";
+    Target = STRING(PYMAJMIN);
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_Versions_ver_Headers
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver;
+    Name = "Headers";
+    Target = STRING(CONCAT3(include/python,PYMAJMIN,m));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_idle
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "pydoc";
-    Target = STRING(CONCAT2(pydoc,PYMAJMIN));
+    Name = "idle3";
+    Target = STRING(CONCAT2(idle,PYMAJMIN));
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_bin_python_real
+Unixlink gid_Unixlink_Python_bin_pydoc
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "python";
-    Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
+    Name = "pydoc3";
+    Target = STRING(CONCAT2(pydoc,PYMAJMIN));
     Styles = ();
 End
 
 Unixlink gid_Unixlink_Python_bin_python
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "python";
+    Name = "python3";
     Target = STRING(CONCAT2(python,PYMAJMIN));
     Styles = ();
 End
@@ -273,40 +272,88 @@ End
 Unixlink gid_Unixlink_Python_bin_pythonconfig
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "python-config";
+    Name = "python3-config";
     Target = STRING(CONCAT3(python,PYMAJMIN,-config));
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_bin_pythonw_real
+Unixlink gid_Unixlink_Python_bin_pythonw
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "pythonw";
-    Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
+    Name = "pythonw3";
+    Target = STRING(CONCAT2(pythonw,PYMAJMIN));
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_bin_pythonw
+Unixlink gid_Unixlink_Python_bin_pyvenv
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "pythonw";
-    Target = STRING(CONCAT2(pythonw,PYMAJMIN));
+    Name = "pyvenv";
+    Target = STRING(CONCAT2(pyvenv-,PYMAJMIN));
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_bin_smtpdpy
+Unixlink gid_Unixlink_Python_libpython
     BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "smtpd.py";
-    Target = STRING(CONCAT3(smtpd,PYMAJMIN,.py));
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib));
+    Target = "../LibreOfficePython";
     Styles = ();
 End
 
-Unixlink gid_Unixlink_Python_libpython
+Unixlink gid_Unixlink_Python_libpython_m
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,m.dylib));
+    Target = "../LibreOfficePython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_pkgconfig
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig;
+    Name = "python3.pc";
+    Target = STRING(CONCAT3(python-,PYMAJMIN,.pc));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_pkgconfig_m
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig;
+    Name = STRING(CONCAT3(python-,PYMAJMIN,m.pc));
+    Target = STRING(CONCAT3(python-,PYMAJMIN,.pc));
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_libpython_config_a
     BIN_FILE_BODY;
     Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
-    Name = STRING(PY_FULL_DLL_NAME);
-    Target = "../../../OOoPython";
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,.a));
+    Target = "../../../LibreOfficePython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_libpython_config_dylib
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,.dylib));
+    Target = "../../../LibreOfficePython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_libpython_m_config_a
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,m.a));
+    Target = "../../../LibreOfficePython";
+    Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_libpython_m_config_dylib
+    BIN_FILE_BODY;
+    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,m.dylib));
+    Target = "../../../LibreOfficePython";
     Styles = ();
 End
 #endif //MACOSX
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index d379f27..629a864 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -39,6 +39,7 @@ Module gid_Module_Optional_Pyuno
             gid_Dir_PythonFramework_Versions_ver,
             gid_Dir_PythonFramework_Versions_ver_bin,
             gid_Dir_PythonFramework_Versions_ver_lib,
+            gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config,
             gid_Dir_Py_PythonCore,
@@ -54,23 +55,28 @@ Module gid_Module_Optional_Pyuno
              gid_File_Py_Python_Core,
              gid_File_Py_Python_Bin,
              gid_File_Lib_Python_So,
-             gid_Shortcut_Lib_Python_So,
+             gid_File_Lib_Python3_So,
              gid_File_Scripts_Python,
              gid_File_Share_Registry_Pyuno_Xcd);
     Unixlinks = (gid_Unixlink_Python_Headers,
+                 gid_Unixlink_Python_LibreOfficePython,
                  gid_Unixlink_Python_Resources,
                  gid_Unixlink_Python_Versions_Current,
                  gid_Unixlink_Python_Versions_ver_Headers,
-                 gid_Unixlink_Python_OOoPython,
                  gid_Unixlink_Python_bin_idle,
                  gid_Unixlink_Python_bin_pydoc,
-                 gid_Unixlink_Python_bin_python_real,
                  gid_Unixlink_Python_bin_python,
                  gid_Unixlink_Python_bin_pythonconfig,
-                 gid_Unixlink_Python_bin_pythonw_real,
                  gid_Unixlink_Python_bin_pythonw,
-                 gid_Unixlink_Python_bin_smtpdpy,
-                 gid_Unixlink_Python_libpython);
+                 gid_Unixlink_Python_bin_pyvenv,
+                 gid_Unixlink_Python_libpython,
+                 gid_Unixlink_Python_libpython_m,
+                 gid_Unixlink_Python_pkgconfig,
+                 gid_Unixlink_Python_pkgconfig_m,
+                 gid_Unixlink_Python_libpython_config_a,
+                 gid_Unixlink_Python_libpython_config_dylib,
+                 gid_Unixlink_Python_libpython_m_config_a,
+                 gid_Unixlink_Python_libpython_m_config_dylib);
     Minimal = NO;
     Default = YES;
     Styles = ( );
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 46d515c..aa14834 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -48,7 +48,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
     Order = 1;
     Key = "PYUNO_LOADER_PYTHONHOME";
   #ifdef MACOSX
-    Value = CONCAT2($ORIGIN,"OOoPython.framework");
+    Value = CONCAT2($ORIGIN,/LibreOfficePython.framework);
   #else
     Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
   #endif
@@ -66,7 +66,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
 #else
   #ifdef UNX
     #ifdef MACOSX
-    #define FRAMEWORKLIB CONCAT4($ORIGIN/OOoPython.framework/Versions/,PYMAJMIN,/lib/python,PYMAJMIN)
+    #define FRAMEWORKLIB CONCAT3($ORIGIN,/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
     Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
 		   /lib-dynload FRAMEWORKLIB,
 		   /lib-tk FRAMEWORKLIB,
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index a7df568..97458e4 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -67,7 +67,8 @@ foreach $file (@todo)
         {
             my $full = $1;
             my $loc = locate($2);
-            $loc = locate($1) if $full =~ m'^\s*@loader_path/(OOoPython.framework/Versions/[^/]+/OOoPython)';
+            # mapping for PythonFramework in RepositoryExternal.mk
+            next if $full =~ m'^\s*@loader_path/(LibreOfficePython.framework/Versions/[^/]+/LibreOfficePython)';
             if (defined $loc)
             {
                 handle($full, $loc) unless defined $done{$full};
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8ff3ce7..3b8a97e 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 6f8f95fed7a4bd741bf035f53a758ac0c6da66b2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Nov 27 12:19:22 2012 +0100

    warning C4805: '!=': unsafe mix of bool and sal_Bool
    
    Change-Id: I42e2de6b4837c2fa334003e670a1aed8881476e5

diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index fa908a7..a83e399 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -76,7 +76,7 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat& rCurrent, const SwDocStat&
     setValue(m_pDocCjkcharsFT, rDoc.nAsianWord);
 
     bool bShowCJK = (SvtCJKOptions().IsAnyEnabled() || rDoc.nAsianWord);
-    bool bToggleCJK = m_pCurrentCjkcharsFT->IsVisible() != bShowCJK;
+    bool bToggleCJK = m_pCurrentCjkcharsFT->IsVisible() != static_cast<sal_Bool>(bShowCJK);
     if (bToggleCJK)
     {
         showCJK(bShowCJK);
commit 59a9bac2bf66d4a9e96eea41831b7fb016fb44e8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Nov 27 12:16:17 2012 +0100

    dbaccess: warning C4530: C++ exception handler used ... specify /EHsc
    
    Change-Id: I273b800c36038be64cdc9f85872ee95983077da7

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 2e2f5ec..9bfe58b 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/control/marktree \
     dbaccess/source/ui/control/opendoccontrols \
     dbaccess/source/ui/control/RelationControl \
+    dbaccess/source/ui/control/ScrollHelper \
     dbaccess/source/ui/control/sqledit \
     dbaccess/source/ui/control/SqlNameEdit \
     dbaccess/source/ui/control/statusbarontroller \
@@ -227,6 +228,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/querydesign/TableConnection \
     dbaccess/source/ui/querydesign/TableConnectionData \
     dbaccess/source/ui/querydesign/TableFieldDescription \
+    dbaccess/source/ui/querydesign/TableFieldInfo \
     dbaccess/source/ui/querydesign/TableWindow \
     dbaccess/source/ui/querydesign/TableWindowAccess \
     dbaccess/source/ui/querydesign/TableWindowData \
@@ -266,11 +268,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/uno/UserSettingsDlg \
 ))
 
-$(eval $(call gb_Library_add_noexception_objects,dbu,\
-    dbaccess/source/ui/control/ScrollHelper \
-    dbaccess/source/ui/querydesign/TableFieldInfo \
-))
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/dlg/adodatalinks \


More information about the Libreoffice-commits mailing list