[Libreoffice-commits] core.git: solenv/bin

[Christian Lohmaier (via logerrit)]

 solenv/bin/modules/installer/download.pm      |    6 +++++-
 solenv/bin/modules/installer/parameter.pm     |    2 +-
 solenv/bin/modules/installer/simplepackage.pm |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit cc46ce1b78fe71eb66fc0a09e44f01428a9e4069
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Fri Jan 22 13:59:39 2021 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Mon Jan 25 12:51:39 2021 +0100

    fix packaging of mac builds targeting apple silicone
    
    the scpactions are what assemble the dmg (add the license & readme
    folders, the background image and the .DS_Store for alignment/the
    layout).
    Adding the AARCH64 statement is necessary to add the architecture to the
    filename.
    
    Change-Id: I0095b8d631cdaa7ce4333fde15dd17d4faf44e8f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109818
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 63103816e89f..466bb4433205 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -390,6 +390,10 @@ sub get_download_architecture
     {
         $arch = "x86-64";
     }
+    elsif ( $installer::globals::cpuname eq 'AARCH64' )
+    {
+        $arch = "aarch64";
+    }
 
     return $arch;
 }
@@ -565,7 +569,7 @@ sub resolve_variables_in_downloadname
     elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; }
     elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; }
     elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
-    elsif ( $installer::globals::platformid eq 'macosx_x86_64' ) { $os = "macosxx"; }
+    elsif ( $installer::globals::ismacbuild ) { $os = "macosxx"; }
     else { $os = ""; }
     $downloadname =~ s/\{os\}/$os/;
 
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index f16259bd9023..8c63a341d34d 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -269,7 +269,7 @@ sub setglobalvariables
         }
     }
 
-    if ( $installer::globals::platformid eq 'macosx_x86_64')
+    if ( $installer::globals::os eq 'MACOSX' )
     {
         $installer::globals::ismacbuild = 1;
 
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index f449d1c81044..c5b8dd24c44e 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -700,7 +700,7 @@ sub create_simple_package
     my $extensionfolder = get_extensions_dir($subfolderdir);
     installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
-    if ( $installer::globals::platformid eq 'macosx_x86_64' )
+    if ( $installer::globals::ismacbuild )
     {
         installer::worker::put_scpactions_into_installset("$installdir/$packagename");
     }