config_host.mk.in | 1 +
configure.ac | 31 +++++++++++++------------------
solenv/bin/macosx-codesign-app-bundle | 3 ++-
sysui/desktop/macosx/Info.plist.in | 4 ++--
4 files changed, 18 insertions(+), 21 deletions(-)
New commits:
commit 1b92c8bae498b7c59c6a074744c3f29512d05411
Author: Tor Lillqvist <t...@collabora.com>
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 493ef888c44f3ee132b78a66eaa5be77c8ddf83f
Author: Tor Lillqvist <t...@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 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 34729c86a55ea7fec5dd04bc095b45db84aafdac
Author: Tor Lillqvist <t...@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 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 f9a08aa..785fc52 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(libc++,
AS_HELP_STRING([--enable-libc++],
[Use the libc++ C++ library instead of GNU libstdc++ on OS X. Only
effective
@@ -3014,11 +3019,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
@@ -3037,6 +3044,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 ===================================================================
commit 7b743040d2b7c32901f551566d5fd9df8a51b0c3
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jun 6 17:39:04 2014 +0300
PackageMaker does not exist any more
Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401
diff --git a/configure.ac b/configure.ac
index d6a67e4..f9a08aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1467,7 +1467,7 @@ AC_ARG_WITH(package-format,
[Specify package format(s) for LibreOffice installation sets. The
implicit --without-package-format leads to no installation sets being
generated. Possible values: aix, archive, bsd, deb, dmg,
- installed, msi, native, osx, pkg, portable, and rpm.
+ installed, msi, native, pkg, portable, and rpm.
Example: --with-package-format='deb rpm']),
,)
@@ -4552,14 +4552,13 @@ AC_MSG_CHECKING([which package format to use])
if test -n "$with_package_format" -a "$with_package_format" != no; then
for i in $with_package_format; do
case "$i" in
- aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg
| installed | msi)
+ aix | bsd | deb | pkg | rpm | native | portable | archive | dmg |
installed | msi)
;;
*)
AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
aix - AIX software distribution
bsd - FreeBSD, NetBSD, or OpenBSD software distribution
deb - Debian software distribution
-osx - MacOS X software distribution
pkg - Solaris software distribution
rpm - RedHat software distribution
native - "Native" software distribution for the platform
@@ -7351,18 +7350,6 @@ if test "$enable_epm" = "yes"; then
AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
fi
fi
- if echo "$PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
- if test "$_os" = "Darwin"; then
- AC_MSG_CHECKING([for PackageMaker availability])
- if ! test -x
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker;
then
- AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
- else
- AC_MSG_RESULT([ok])
- fi
- else
- AC_MSG_ERROR([PackageMaker needed to build OSX packages and you
are not on OSX...])
- fi
- fi
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
if test "$with_epm" = "no" -a "$_os" != "Darwin"; then
@@ -7401,7 +7388,7 @@ if test "$enable_epm" = "yes"; then
else
for i in $PKGFORMAT; do
case "$i" in
- aix | bsd | deb | osx | pkg | rpm | native | portable)
+ aix | bsd | deb | pkg | rpm | native | portable)
AC_MSG_ERROR(
[--with-package-format='$PKGFORMAT' requires --enable-epm])
;;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
