diff options
| -rw-r--r-- | Makefile.in | 24 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo_macosx.scp | 2 | ||||
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 2 | ||||
| -rwxr-xr-x | solenv/bin/ooinstall | 5 | ||||
| -rwxr-xr-x | sysui/desktop/macosx/Info.plist.in | 4 |
8 files changed, 29 insertions, 33 deletions
diff --git a/Makefile.in b/Makefile.in index bd52c7e2a901..f7f68ed31123 100644 --- a/Makefile.in +++ b/Makefile.in @@ -324,37 +324,37 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # # Create Resources/*.lproj directories for languages supported by OS X set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \ - lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \ - mkdir $$lproj; \ + lproj=$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Resources/$$lang.lproj; \ + mkdir "$$lproj"; \ done # # And remove the "bin" folder which should not be there - rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin + rm -rf $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/bin # # Remove unnecessary executables in the LibreOfficePython framework - rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin + rm -rf $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin # # Remove the python.o object file which is weird and interferes with app store uploading # And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either. - rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* + rm -rf $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* # ifneq ($ENABLE_MACOSX_SANDBOX),) -# Remove the gengal.bin binary and unopkg script that we don't want - rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin - rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg +# Remove the gengal binary and unopkg script that we don't want + rm $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal + rm $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg endif # # Then use the macosx-codesign-app-bundle script - @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app + @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app endif endif @$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR)) mac-app-store-package: test-install ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),) - rm -rf "$(MACOSX_APP_NAME).app" - mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app" - productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg + rm -rf "$(PRODUCTNAME).app" + mv "$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app" "$(PRODUCTNAME).app" + productbuild --component "$(PRODUCTNAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(PRODUCTNAME_WITHOUT_SPACES).pkg else @echo You did not provide an installer signing identity with --enable-macosx-package-signing @exit 1 diff --git a/config_host.mk.in b/config_host.mk.in index 91eeabaa2a45..ccefde983260 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -369,7 +369,6 @@ 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_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@ @@ -460,6 +459,7 @@ export POSTGRESQL_INC=@POSTGRESQL_INC@ export POSTGRESQL_LIB=@POSTGRESQL_LIB@ export PREFIXDIR=@PREFIXDIR@ export PRODUCTNAME=@PRODUCTNAME@ +export PRODUCTNAME_WITHOUT_SPACES=@PRODUCTNAME_WITHOUT_SPACES@ export PRODUCTVERSION=@PRODUCTVERSION@ export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@ export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@ diff --git a/configure.ac b/configure.ac index 1ec225043428..e378892962fa 100644 --- a/configure.ac +++ b/configure.ac @@ -153,11 +153,16 @@ AC_CANONICAL_HOST AC_MSG_CHECKING([for product name]) PRODUCTNAME="AC_PACKAGE_NAME" +if test -n "$with_product_name" -a "$with_product_name" != no; then + PRODUCTNAME="$with_product_name" +fi if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then PRODUCTNAME="${PRODUCTNAME}Dev" fi AC_MSG_RESULT([$PRODUCTNAME]) AC_SUBST(PRODUCTNAME) +PRODUCTNAME_WITHOUT_SPACES=${PRODUCTNAME// /} +AC_SUBST(PRODUCTNAME_WITHOUT_SPACES) dnl =================================================================== dnl Our version is defined by the AC_INIT() at the top of this script. @@ -724,7 +729,7 @@ darwin*) # Mac OS X or iOS mac_sanitize_path AC_MSG_NOTICE([sanitized the PATH to $PATH]) fi - INSTROOTSUFFIX=/$PRODUCTNAME.app/Contents + INSTROOTSUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app/Contents SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK fi enable_systray=no @@ -1433,10 +1438,10 @@ 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_WITH(product-name, + AS_HELP_STRING([--with-product-name='My Own Office Suite'], + [Define the product name. Default is AC_PACKAGE_NAME.]), +,with_product_name=$PRODUCTNAME) AC_ARG_ENABLE(ios-simulator, AS_HELP_STRING([--enable-ios-simulator], @@ -3031,11 +3036,6 @@ if test $_os = Darwin; then 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) @@ -3048,7 +3048,6 @@ AC_SUBST(MACOSX_CODESIGNING_IDENTITY) AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY) AC_SUBST(ENABLE_MACOSX_SANDBOX) AC_SUBST(MACOSX_BUNDLE_IDENTIFIER) -AC_SUBST(MACOSX_APP_NAME) dnl =================================================================== dnl Check iOS SDK and compiler diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 5f511178a9c8..7a8b9b8055bc 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -44,7 +44,7 @@ LibreOffice { variables { - PRODUCTNAME LibreOffice + PRODUCTNAME @PRODUCTNAME@ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ POSTVERSIONEXTENSION diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp index 0bc7bfd44d25..b7174607e2d5 100644 --- a/scp2/source/ooo/directory_ooo_macosx.scp +++ b/scp2/source/ooo/directory_ooo_macosx.scp @@ -21,7 +21,7 @@ #ifdef MACOSX Directory gid_Dir_Bundle ParentID = PD_PROGDIR; - HostName = "%PRODUCTNAME.app"; + HostName = "%ONEWORDPRODUCTNAME.app"; End Directory gid_Dir_Bundle_Contents diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index afd3e6829765..37245c1a7205 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -98,7 +98,7 @@ done # # At this stage we also attach the entitlements in the sandboxing case -id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'` +id=`echo ${PRODUCTNAME} | tr ' ' '-'` if test -n "$ENABLE_MACOSX_SANDBOX"; then entitlements="--entitlements $BUILDDIR/lo.xcent" diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index edd3d83f2c4b..8d0f5be27512 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -89,14 +89,11 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") { print "Running LibreOffice installer\n"; -my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME}; -$PRODUCTNAME_no_spaces =~ s/ //g; - system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl " . (scalar keys(%DB::sub) ? "-d " : "") . "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " . - "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p $PRODUCTNAME_no_spaces " . + "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " . "-u $tmp_dir " . "-buildid $BUILD $destdir $strip $msi " . "-simple $path") && die "Failed to install: $!"; diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index bd10c26b2ed7..75980deef9e6 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1828,7 +1828,7 @@ <key>CFBundleExecutable</key> <string>soffice</string> <key>CFBundleGetInfoString</key> - <string>@MACOSX_APP_NAME@ @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@</string> + <string>@PRODUCTNAME@ @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> @@ -1840,7 +1840,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>@MACOSX_APP_NAME@</string> + <string>@PRODUCTNAME@</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> |