configure.ac | 2 +-
scp2/source/sdkoo/sdkoo.scp | 2 +-
solenv/bin/modules/installer/simplepackage.pm | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit ce308d606caa658f20839cbe68387f866acac2b6
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri May 8 21:32:50 2020 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed May 13 13:34:36 2020 +0200
macOS: don't hardcode LibreOffice in SDK directory, use $PRODUCTNAME
so that it will use LibreOfficeDev when not using --enable-release-build
Change-Id: I60794ababce11355659d483197ce8b0193d375b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93817
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 06b0dd704f4f..c670181c65d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -710,7 +710,7 @@ darwin*) # macOS or iOS
_os=Darwin
INSTROOTBASESUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app
INSTROOTCONTENTSUFFIX=/Contents
- SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK
+ SDKDIRNAME=${PRODUCTNAME}${PRODUCTVERSION}_SDK
fi
# See comment above the case "$host_os"
LINKFLAGSSHL="-dynamiclib -single_module"
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index e4ff95221013..d0ebc0f6d1bc 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -48,7 +48,7 @@ Directory gid_Dir_Sdkoo_Sdk
ParentID = PREDEFINED_PROGDIR;
#endif
#ifdef MACOSX
- DosName = "LibreOffice${PRODUCTVERSION}_SDK";
+ DosName = "${PRODUCTNAME}${PRODUCTVERSION}_SDK";
#else
DosName = "sdk";
#endif
commit d3942a41d98dbb2d41615c0eac4c39ff9946cd66
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed May 13 11:49:55 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed May 13 13:34:29 2020 +0200
Remove some code that was commented-out ten years ago
Change-Id: Iead0a7e770a5533e3fe4585f76e343f0039328fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94105
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 7c7afe67d513..a0a7163ad31a 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -342,7 +342,6 @@ sub create_package
if ( $installer::globals::languagepack ) { $scriptfilename =
"osx_install_languagepack.applescript"; }
if ( $installer::globals::helppack ) { $scriptfilename =
"osx_install_helppack.applescript"; }
my $scripthelperfilename = $ENV{'SRCDIR'} .
"/setup_native/scripts/mac_install.script";
- # my $scripthelperrealfilename = $volume_name;
my $scripthelperrealfilename = $volume_name_classic_app;
# Finding both files in source tree
@@ -362,7 +361,7 @@ sub create_package
my $scriptfilecontent =
installer::files::read_file($scriptfilename);
my $translationfilecontent =
installer::files::read_file($installer::globals::macinstallfilename);
localize_scriptfile($scriptfilecontent, $translationfilecontent,
$languagestringref);
- # replace_variables_in_scriptfile($scriptfilecontent,
$volume_name, $allvariables);
+
replace_variables_in_scriptfile($scriptfilecontent,
$volume_name_classic, $volume_name_classic_app, $allvariables);
installer::files::save_file($scriptfilename, $scriptfilecontent);
@@ -384,7 +383,7 @@ sub create_package
$destfile = "$contentsfolder/Info.plist";
# Replacing variables in Info.plist
$scriptfilecontent = installer::files::read_file($infoplistfile);
- # replace_one_variable_in_shellscript($scriptfilecontent,
$volume_name, "FULLPRODUCTNAME" );
+
replace_one_variable_in_shellscript($scriptfilecontent,
$volume_name_classic_app, "FULLAPPPRODUCTNAME" ); # OpenOffice.org Language Pack
replace_one_variable_in_shellscript($scriptfilecontent,
$ENV{'MACOSX_BUNDLE_IDENTIFIER'}, "BUNDLEIDENTIFIER" );
installer::files::save_file($destfile, $scriptfilecontent);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
