This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch mac-vcl-button-contrast in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6e4ffa4530ceb9dd20ba0be4e7188f4cf37ecc3f Author: peter kovacs <[email protected]> AuthorDate: Thu Sep 10 05:47:45 2026 +0200 installer: move the macOS signing tooling into solenv/bin mac-silicon-sign.sh is not a developer entry point like the bootstrap, configure and build wrappers next to it in the source root - it is tooling the build itself invokes, twice, from simplepackage.pm. Put it where the rest of the build tooling lives. The entitlements plist moves with it. The script resolves its default entitlements as $(dirname $0)/mac-silicon-entitlements.plist, so separating the two would have left it looking in solenv/bin for a file still in the root - and that only fails at signing time, not at build time. Keeping them together also means no path logic changes and the script stays runnable by hand from anywhere. simplepackage.pm now resolves it through $SOLARENV, matching how installer/control.pm already locates solenv, rather than through $SRC_ROOT. Verified end to end: a full openoffice_en-US.dmg build signs the .app and the .dmg from the new location, and both pass codesign --verify. Co-Authored-By: Claude Opus 5 <[email protected]> --- .agent/mac-silicon-port.md | 6 +++--- main/{ => solenv/bin}/mac-silicon-entitlements.plist | 0 main/{ => solenv/bin}/mac-silicon-sign.sh | 2 +- main/solenv/bin/modules/installer/simplepackage.pm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.agent/mac-silicon-port.md b/.agent/mac-silicon-port.md index 16382d19b6..11927fbe03 100644 --- a/.agent/mac-silicon-port.md +++ b/.agent/mac-silicon-port.md @@ -302,9 +302,9 @@ the macOS `scp2` branches to that layout: The `.dmg` now ships an application that passes `codesign --verify --deep --strict`. The fix is in the build and the installer, not in a post-processing pass. - ./mac-silicon-sign.sh /Applications/OpenOffice.app # ad-hoc - ./mac-silicon-sign.sh -i "Developer ID Application: NAME (TEAMID)" OpenOffice.app - ./mac-silicon-sign.sh --verify OpenOffice.app + ./solenv/bin/mac-silicon-sign.sh /Applications/OpenOffice.app # ad-hoc + ./solenv/bin/mac-silicon-sign.sh -i "Developer ID Application: NAME (TEAMID)" OpenOffice.app + ./solenv/bin/mac-silicon-sign.sh --verify OpenOffice.app MACOSX_CODESIGNING_IDENTITY=- ./mac-silicon-build.sh # signed .dmg ### What was wrong diff --git a/main/mac-silicon-entitlements.plist b/main/solenv/bin/mac-silicon-entitlements.plist similarity index 100% rename from main/mac-silicon-entitlements.plist rename to main/solenv/bin/mac-silicon-entitlements.plist diff --git a/main/mac-silicon-sign.sh b/main/solenv/bin/mac-silicon-sign.sh similarity index 98% rename from main/mac-silicon-sign.sh rename to main/solenv/bin/mac-silicon-sign.sh index 5a085604c2..b7258cdfcd 100755 --- a/main/mac-silicon-sign.sh +++ b/main/solenv/bin/mac-silicon-sign.sh @@ -2,7 +2,7 @@ # # Code-sign a built Apache OpenOffice .app (or .dmg) on macOS. # -# ./mac-silicon-sign.sh [options] <OpenOffice.app|installer.dmg> ... +# ./solenv/bin/mac-silicon-sign.sh [options] <OpenOffice.app|installer.dmg> ... # # Options: # -i, --identity ID codesign identity; "-" = ad-hoc (default, or diff --git a/main/solenv/bin/modules/installer/simplepackage.pm b/main/solenv/bin/modules/installer/simplepackage.pm index 1b61a1e4f3..4ff61f6a09 100644 --- a/main/solenv/bin/modules/installer/simplepackage.pm +++ b/main/solenv/bin/modules/installer/simplepackage.pm @@ -545,7 +545,7 @@ sub create_package # MACOSX_CODESIGNING_IDENTITY the installation set is left as it was. if ( $ENV{'MACOSX_CODESIGNING_IDENTITY'} ) { - my $signscript = $ENV{'SRC_ROOT'} . "/mac-silicon-sign.sh"; + my $signscript = $ENV{'SOLARENV'} . "/bin/mac-silicon-sign.sh"; foreach my $appdir ( glob("$localtempdir/$folder/*.app") ) { my $signcall = "$signscript -i \"$ENV{'MACOSX_CODESIGNING_IDENTITY'}\" \"$appdir\""; @@ -614,7 +614,7 @@ sub create_package ( $ENV{'MACOSX_CODESIGNING_IDENTITY'} ) && ( $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "-" )) { - my $signscript = $ENV{'SRC_ROOT'} . "/mac-silicon-sign.sh"; + my $signscript = $ENV{'SOLARENV'} . "/bin/mac-silicon-sign.sh"; my $signcall = "$signscript -i \"$ENV{'MACOSX_CODESIGNING_IDENTITY'}\" \"$archive\""; my $signreturn = system($signcall); if ( $signreturn ) { installer::exiter::exit_program("ERROR: Could not code-sign $archive!", "create_package"); }
