solenv/bin/macosx-codesign-app-bundle | 2 +-
solenv/bin/modules/installer/simplepackage.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1742ac5b784922032fb9aae5e61909bd9ab3c578
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu May 7 14:31:25 2020 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu May 7 14:31:25 2020 +0200
fix macOS codesigning when using a separate builddir
88453fd13a653963b394b8f865ff104b5545f137 changed the
hardened_runtime.xcent to a generated file
Change-Id: I54b927d1990835bb902f62e03d51b0e70735269c
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index db2f6ffc55d2..8a8f8445c629 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -36,7 +36,7 @@ if test -n "$ENABLE_MACOSX_SANDBOX"; then
other_files=''
else
# We then want to sign data files, too, hmm.
- entitlements="--entitlements $SRCDIR/hardened_runtime.xcent"
+ entitlements="--entitlements $BUILDDIR/hardened_runtime.xcent"
other_files="\
-or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
-or -name '*.jar' -or -name 'LICENSE' -or -name 'LICENSE.html' \
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index b32f77d3bef6..7c7afe67d513 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -433,7 +433,7 @@ sub create_package
opendir(my $dh, $sdkbindir);
foreach my $sdkbinary (readdir $dh) {
next unless -f "$sdkbindir/$sdkbinary";
- $systemcall = "codesign --force --verbose
--options=runtime --identifier='$ENV{MACOSX_BUNDLE_IDENTIFIER}.$sdkbinary'
--sign '$ENV{MACOSX_CODESIGNING_IDENTITY}' --entitlements
$ENV{SRCDIR}/hardened_runtime.xcent $sdkbindir/$sdkbinary >
/tmp/codesign_losdk_$sdkbinary.log 2>&1";
+ $systemcall = "codesign --force --verbose
--options=runtime --identifier='$ENV{MACOSX_BUNDLE_IDENTIFIER}.$sdkbinary'
--sign '$ENV{MACOSX_CODESIGNING_IDENTITY}' --entitlements
$ENV{BUILDDIR}/hardened_runtime.xcent $sdkbindir/$sdkbinary >
/tmp/codesign_losdk_$sdkbinary.log 2>&1";
print "... $systemcall ...\n";
my $returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
