[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - Makefile.in scp2/source setup_native/source solenv/bin sysui/desktop
Tor Lillqvist
tml at collabora.com
Wed Jun 4 13:36:20 PDT 2014
Makefile.in | 7 ++++---
scp2/source/ooo/directory_ooo_macosx.scp | 2 +-
setup_native/source/mac/CodesignRules.plist | 2 +-
solenv/bin/macosx-codesign-app-bundle | 1 +
solenv/bin/modules/installer/simplepackage.pm | 6 +++---
sysui/desktop/macosx/Info.plist.in | 2 +-
6 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 4 21:26:20 2014 +0300
Collabora branding
Change-Id: I6044c9aeba8b7f3a58b0465b2944275bb5aee6bb
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index 0bc7bfd..7d697ec 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 = "LibreOffice from Collabora.app";
End
Directory gid_Dir_Bundle_Contents
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 9c61d66..35793a3 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -270,7 +270,7 @@ sub create_package
my $volume_name = $allvariables->{'PRODUCTNAME'};
my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'};
- my $volume_name_classic_app = $volume_name; # "app" should not contain version number
+ my $volume_name_classic_app = 'LibreOffice from Collabora'; # "app" should not contain version number
if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
$volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
$volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
@@ -411,10 +411,10 @@ sub create_package
}
else
{
- if (($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev') &&
+ if (($volume_name_classic_app eq 'LibreOffice from Collabora' || $volume_name_classic_app eq 'LibreOfficeDev') &&
defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
{
- $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle $localtempdir/$folder/$volume_name_classic_app.app";
+ $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle \"$localtempdir/$folder/$volume_name_classic_app.app\"";
print "... $systemcall ...\n";
my $returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index 16f9eae..2d88882 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1411,7 +1411,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>@PRODUCTNAME@</string>
+ <string>LibreOffice from Collabora</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
commit 8a20e9f511c0c07d7d3121ca1a22a80003653ac0
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 4 20:06:12 2014 +0300
Turn eventual spaces in the app bundle name into dashes in its codesigning id
Change-Id: Ibf643da61ce7fffb9bc8e704914afb5985be8f6a
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 7ac93d4..532ce5e 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -89,6 +89,7 @@ if test "$ENABLE_MACOSX_SANDBOX" = "TRUE"; then
fi
id=`basename "$APP_BUNDLE"`
+id=`echo $id | tr ' ' '-'`
codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" --resource-rules "$SRCDIR/setup_native/source/mac/CodesignRules.plist" --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE"
exit 0
commit dc6602ab701d2f92d845163c6de425a4e6ff2ef4
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 4 20:01:48 2014 +0300
unopkg is not signed either, for some reason
Change-Id: I820214f4c248b4f3483a72998ead75aaa1e280ed
diff --git a/setup_native/source/mac/CodesignRules.plist b/setup_native/source/mac/CodesignRules.plist
index e638f92..b924e05 100644
--- a/setup_native/source/mac/CodesignRules.plist
+++ b/setup_native/source/mac/CodesignRules.plist
@@ -10,7 +10,7 @@
<false/>
<key>^MacOS/postgresql-sdbc.ini$</key>
<false/>
- <key>^MacOS/(senddoc|python|gengal|unoinfo)$</key>
+ <key>^MacOS/(senddoc|python|gengal|unoinfo|unopkg)$</key>
<false/>
<key>.*\.(png|svg|py|res|rdb)$</key>
<false/>
commit faccaa6fd80480d5fcfe25582951a1f97f2a536d
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 4 19:57:20 2014 +0300
test-install doesn't work for OS X and seems unnecessary anyway
Change-Id: If0623589ae064f7a038f3761ab7b50528ac521d6
diff --git a/Makefile.in b/Makefile.in
index 206f5ed..6a3c56b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -279,10 +279,13 @@ else
@echo " instdir/program/soffice"
endif
@echo
+ifneq ($(OS),MACOSX)
@echo "(only if you have good reason to test an actual installation: make test-install)"
@echo
+endif
@false
+ifneq ($(OS),MACOSX)
test-install: build
@rm -rf $(TESTINSTALLDIR)
@mkdir -p $(TESTINSTALLDIR)
@@ -290,11 +293,9 @@ ifeq ($(OS_FOR_BUILD),WNT)
cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
else
@ooinstall $(TESTINSTALLDIR)
-ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
- @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
-endif
endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
+endif
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
More information about the Libreoffice-commits
mailing list