config_host.mk.in | 1 + configure.ac | 12 ++++++++++-- solenv/bin/macosx-codesign-app-bundle | 3 ++- sysui/desktop/macosx/Info.plist.in | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-)
New commits: commit 7302770f4c391aaa283a9557fe693f5fd47f35bb Author: Tor Lillqvist <[email protected]> Date: Sun Jun 8 10:51:59 2014 +0300 Use MACOSX_APP_NAME (with dashes instead of spaces) instead of build-time name Change-Id: I01bf646635668429c68f53bd6ab543b7a8b0be2d diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index 99f7565..0eca560 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -72,6 +72,7 @@ if test "$ENABLE_MACOSX_SANDBOX" = "TRUE"; then entitlements="--entitlements $BUILDDIR/lo.xcent" fi -codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$(basename ${APP_BUNDLE})" --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE +id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'` +codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE exit 0 commit 02d84b903eca7cfafdf250a34edbbabf0c43eeef Author: Tor Lillqvist <[email protected]> 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 a7cb96f..f6d1dc8 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@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string> + <string>@MACOSX_APP_NAME@ @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@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 d7b3b5c09d2acbdf385cbf3b87002235594e14ad Author: Tor Lillqvist <[email protected]> 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 82b2028..1bc0da0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -359,6 +359,7 @@ export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@ 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 7995588..9cc1583 100644 --- a/configure.ac +++ b/configure.ac @@ -1306,6 +1306,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(ios-simulator, AS_HELP_STRING([--enable-ios-simulator], [Build for the iOS Simulator, not iOS device.]), @@ -2994,11 +2999,13 @@ 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]) + AC_MSG_CHECKING([build with mac retina support]) if test "$enable_macosx_retina" = yes ; then MACOSX_HIGH_RESOLUTION_VALUE=true @@ -3017,6 +3024,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) AC_SUBST(MACOSX_HIGH_RESOLUTION_VALUE) dnl =================================================================== _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
