[Libreoffice-commits] .: 2 commits - solenv/bin

[Libreoffice Gerrit user]

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

New commits:
commit e3dfe8905fc3d7ec1d0dd0fc20ac1189d2636e53
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jan 19 21:10:29 2013 +0200

    Handle unxmacxx, too

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 6d370ae..ca39a96 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -422,6 +422,10 @@ sub get_download_architecture
     {
         $arch = "x86";
     }
+    elsif ( $installer::globals::compiler =~ /^unxmacxx/ )
+    {
+        $arch = "x86-64";
+    }
     elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
     {
         $arch = "PPC";
@@ -596,6 +600,7 @@ sub resolve_variables_in_downloadname
     elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; }
     elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
     elsif ( $installer::globals::compiler =~ /unxmacxi/ ) { $os = "macosxi"; }
+    elsif ( $installer::globals::compiler =~ /unxmacxx/ ) { $os = "macosxx"; }
     elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosxp"; }
     else { $os = ""; }
     $downloadname =~ s/\{os\}/$os/;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 2aa0a28..deda9d3 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -268,7 +268,7 @@ sub setglobalvariables
         }
     }
 
-    if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ ))
+    if ( $installer::globals::compiler =~ /unxmacx/ )
     {
         $installer::globals::ismacbuild = 1;
 
commit c7e3f88b1291c35e09d08d14f82eadf60f7063cd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jan 19 21:05:59 2013 +0200

    Fix Mac build fallout from PRODUCTEXTENSION change
    
    PRODUCTEXTENSION used to be empty. (No idea for how long it had been
    empty.) And apparently some of the "installer" Perl code implicitly
    assumed PRODUCTEXTENSION was empty. At least, producing the langpack
    dmg for Mac started to fail when PRODUCTEXTENSION was no longer empty.

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index c9ce580..55e65bd 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -278,13 +278,11 @@ sub create_package
             $folder = $packagename;
         }
 
-        # my $volume_name = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; # Adding PRODUCTVERSION makes this difficult to maintain!
         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
-        # $volume_name = $volume_name . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; # Adding PRODUCTEXTENSION makes this difficult to maintain!
-        $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
-        $volume_name_classic_app = $volume_name_classic_app . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
+        $volume_name_classic = $volume_name_classic;
+        $volume_name_classic_app = $volume_name_classic_app;
         if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
             $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
             $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};