[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - config_host.mk.in configure.ac sysui/desktop

[Tor Lillqvist]

 config_host.mk.in                  |    1 +
 configure.ac                       |   12 ++++++++++--
 sysui/desktop/macosx/Info.plist.in |    4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 69df853a45f2f01162fe59a64eb6c90629ae9350
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 6 11:00:15 2014 +0300

    Use MACOSX_APP_NAME
    
    Change-Id: Id46f2f83ca01a786b93ecce4aa41dea41c45e718

diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index 16f9eae..b0b1984 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1401,7 +1401,7 @@
 	<key>CFBundleExecutable</key>
 	<string>soffice</string>
 	<key>CFBundleGetInfoString</key>
-	<string>@PRODUCTNAME@ @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string>
+	<string>@MACOSX_APP_NAME@ @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string>
 	<key>CFBundleIconFile</key>
 	<string>main.icns</string>
 	<key>CFBundleShortVersionString</key>
@@ -1411,7 +1411,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>@PRODUCTNAME@</string>
+	<string>@MACOSX_APP_NAME@</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
commit 64c0e50af3eaa531d3f0edba4f3c068904910c2c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 6 10:49:22 2014 +0300

    Add --with-macosx-app-name configure option that propagates to MACOSX_APP_NAME
    
    Change-Id: I5997669d9e990c302871e08a336a4d8365d5aa13

diff --git a/config_host.mk.in b/config_host.mk.in
index fd4c560..3febd13 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -356,6 +356,7 @@ export LIBXSLT_MAJOR=@LIBXSLT_MAJOR@
 export LINK_X64_BINARY=@LINK_X64_BINARY@
 @x_Cygwin@ export LS=@WIN_LS@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
+export MACOSX_APP_NAME=@MACOSX_APP_NAME@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
 export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
diff --git a/configure.ac b/configure.ac
index 0ec4aee..736c7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1237,6 +1237,11 @@ AC_ARG_WITH(macosx-bundle-identifier,
          org.libreoffice.script ("script", huh?).]),
 ,with_macosx_bundle_identifier=org.libreoffice.script)
 
+AC_ARG_WITH(macosx-app-name,
+    AS_HELP_STRING([--with-macosx-app-name='My Own Office Suite'],
+        [Define the OS X app name. Default is AC_PACKAGE_NAME.]),
+,with_macosx_app_name=$PRODUCTNAME)
+
 AC_ARG_ENABLE(libc++,
     AS_HELP_STRING([--enable-libc++],
         [Use the libc++ C++ library instead of GNU libstdc++ on OS X. Only effective
@@ -2890,10 +2895,12 @@ if test $_os = Darwin; then
     fi
 
     AC_MSG_CHECKING([what OS X app bundle identifier to use])
-
     MACOSX_BUNDLE_IDENTIFIER=$with_macosx_bundle_identifier
-
     AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER])
+
+    AC_MSG_CHECKING([what OS X app name to use])
+    MACOSX_APP_NAME="$with_macosx_app_name"
+    AC_MSG_RESULT([$MACOSX_APP_NAME])
 fi
 AC_SUBST(MACOSX_SDK_PATH)
 AC_SUBST(MACOSX_SDK_VERSION)
@@ -2905,6 +2912,7 @@ AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU libto
 AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
+AC_SUBST(MACOSX_APP_NAME)
 
 dnl ===================================================================
 dnl Check iOS SDK and compiler