configure.ac | 2 ++ python3/ExternalProject_python3.mk | 4 ++-- python3/python-3.3.0-darwin.patch.1 | 11 +++++++++++ solenv/bin/modules/installer/scriptitems.pm | 5 +++++ solenv/gbuild/platform/macosx.mk | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-)
New commits: commit ccedc240de2ed9f8fd6ea4ed4ae5f7def153130e Author: Michael Stahl <[email protected]> Date: Fri Sep 13 22:31:25 2013 +0200 installer: put in a hack for MacOSX to find language pack files The files are in LibreOffice.app, are packaged in LibreOffice Language Pack.app and will then be copied into LibreOffice.app when the lang-pack is clicked by the user. This also neatly avoids having to deal with file names with spaces in make. Also, root directory is $(PRODUCTNAME).app which works with --disable-release-build too. Change-Id: Ie064831316d790b137022a1632721c62500a46a1 diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 749ada9..e6c7182 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1049,6 +1049,11 @@ sub get_Source_Directory_For_Files_From_Includepathlist { $destination =~ s,$extrarootdir/,,; # remove it from path } + if (($installer::globals::languagepack) && ($installer::globals::ismacbuild)) + { # source files are in $(PRODUCTNAME).app where they will + # actually copied by the user executing the Language Pack.app + $destination =~ s, Language Pack.app/,.app/,; + } $instdirdestination = $ENV{'INSTDIR'} . $installer::globals::separator . $destination; } if ($instdirdestination && -f $instdirdestination) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c8f8fce..c486f2a 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_INSTROOT := $(INSTDIR)/LibreOffice.app/Contents +gb_INSTROOT := $(INSTDIR)/$(PRODUCTNAME).app/Contents gb_DEVINSTALLROOT := $(gb_INSTROOT) gb_SDKDIR := $(MACOSX_SDK_PATH) commit df52c9f477ba2801ed3535762cfa6e89ce9d6812 Author: Michael Stahl <[email protected]> Date: Fri Sep 13 22:01:26 2013 +0200 python3: fix the MacOSX build here too /usr/bin/install -s will invoke "xcrun strip", and there are a few hardocded install_name_tool left. Change-Id: I839af379320b4886c45a12c9a1d4fa88d2ef0059 diff --git a/configure.ac b/configure.ac index a12823a..c145970 100644 --- a/configure.ac +++ b/configure.ac @@ -2722,6 +2722,7 @@ if test $_os = Darwin; then INSTALL_NAME_TOOL=`xcrun -find install_name_tool` AR=`xcrun -find ar` NM=`xcrun -find nm` + STRIP=`xcrun -find strip` LIBTOOL=`xcrun -find libtool` RANLIB=`xcrun -find ranlib` ;; @@ -2885,6 +2886,7 @@ if test $_os = iOS; then INSTALL_NAME_TOOL=`xcrun -find install_name_tool` AR=`xcrun -find ar` NM=`xcrun -find nm` + STRIP=`xcrun -find strip` LIBTOOL=`xcrun -find libtool` RANLIB=`xcrun -find ranlib` fi diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 22065bb..e79a28e 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -120,7 +120,7 @@ cd \"$$origpath\"\n\ touch $@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ExternalProject_get_state_target,python3,build) - install_name_tool -change \ + $(INSTALL_NAME_TOOL) -change \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../../../../LibreOfficePython \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython @@ -132,7 +132,7 @@ $(call gb_ExternalProject_get_state_target,python3,executables) : $(call gb_Exte for file in python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ pythonw$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do \ - install_name_tool -change \ + $(INSTALL_NAME_TOOL) -change \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../LibreOfficePython $$file ; done touch $@ diff --git a/python3/python-3.3.0-darwin.patch.1 b/python3/python-3.3.0-darwin.patch.1 index 7c43d8b..94e48fe 100644 --- a/python3/python-3.3.0-darwin.patch.1 +++ b/python3/python-3.3.0-darwin.patch.1 @@ -24,3 +24,14 @@ diff -ru python3.old_/configure python3/configure ARCH_RUN_32BIT="" LIPO_32BIT_FLAGS="" elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then +--- python3/Mac/Makefile.in.orig 2013-09-13 20:16:50.558137603 +0200 ++++ python3/Mac/Makefile.in 2013-09-13 21:57:14.790962423 +0200 +@@ -39,7 +39,7 @@ + INSTALL_SCRIPT= @INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + LN=@LN@ +-STRIPFLAG=-s ++STRIPFLAG= + CPMAC=CpMac + + APPTEMPLATE=$(srcdir)/Resources/app _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
