diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-04 09:17:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-04 17:44:40 +0300 |
| commit | b640a1343bb73f0c36a316f42847de5d61c156e3 (patch) | |
| tree | 42bc897976f9c94af4037fa0e82f256b45f46e0f /solenv | |
| parent | 33a5ab1eb74d140265b471fb33ca98aca7cfb1a6 (diff) | |
Introduce --with-product-name superseding --with-macosx-app-name
The new option thoroughly replaces the product name mentioned in the
AC_INIT() call. Work in progress.
Also take care of spaces in the product name in a more systematic
fashion.
This should affect mainly OS X where the final app bundle that is
installed should use the product name as such, including spaces, if
any. However, our build system does not cope that well with having an
app bundle with spaces in it in instdir. So in instdir, and also in
test-install, spaces are stripped away from the product name when used
as part of the app bundle name.
Change-Id: Ic16b5039f23c96a4f39387a1869faeb25e05aafb
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 2 | ||||
| -rwxr-xr-x | solenv/bin/ooinstall | 5 |
2 files changed, 2 insertions, 5 deletions
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: $!"; |