native288 #i109809# new download names

4 files changed, 12 insertions, 22 deletions

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index e7c92961a8e8..758620e0e900 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -570,23 +570,11 @@ sub get_download_platformname
 {
     my $platformname = "";
 
-    if (( $installer::globals::islinuxintelrpmbuild ) || ( $installer::globals::islinuxinteldebbuild ))
+    if ( $installer::globals::islinuxbuild )
     {
         $platformname = "Linux";
     }
-    elsif (( $installer::globals::islinuxppcrpmbuild ) || ( $installer::globals::islinuxppcdebbuild ))
-    {
-        $platformname = "Linux";
-    }
-    elsif (( $installer::globals::islinuxx86_64rpmbuild ) || ( $installer::globals::islinuxx86_64debbuild ))
-    {
-        $platformname = "Linux";
-    }
-    elsif ( $installer::globals::issolarissparcbuild )
-    {
-        $platformname = "Solaris";
-    }
-    elsif ( $installer::globals::issolarisx86build )
+    elsif ( $installer::globals::issolarisbuild )
     {
         $platformname = "Solaris";
     }
@@ -594,15 +582,11 @@ sub get_download_platformname
     {
         $platformname = "Win";
     }
-    elsif ( $installer::globals::isfreebsdpkgbuild )
+    elsif ( $installer::globals::isfreebsdbuild )
     {
         $platformname = "FreeBSD";
     }
-    elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
-    {
-        $platformname = "MacOS";
-    }
-    elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
+    elsif ( $installer::globals::ismacbuild )
     {
         $platformname = "MacOS";
     }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 81eaace26343..a2f1117d1946 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -136,7 +136,9 @@ BEGIN
     $issolarispkgbuild = 0;
     $issolarissparcbuild = 0;
     $issolarisx86build = 0;
+    $isfreebsdbuild = 0;
     $isfreebsdpkgbuild = 0;
+    $ismacbuild = 0;
     $ismacdmgbuild = 0;
     $unpackpath = "";
     $idttemplatepath = "";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 8a54c27db3a9..e95df98e64cc 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -290,8 +290,10 @@ sub setglobalvariables
         }
     }
 
-    if ( $installer::globals::compiler =~ /unxmacxi/ )
+    if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ ))
     {
+        $installer::globals::ismacbuild = 1;
+
         if ( $installer::globals::packageformat eq "dmg" )
         {
             $installer::globals::ismacdmgbuild = 1;
@@ -300,6 +302,8 @@ sub setglobalvariables
 
     if ( $installer::globals::compiler =~ /unxfbsd/ )
     {
+        $installer::globals::isfreebsdbuild = 1;
+
         if ( $installer::globals::packageformat eq "bsd" )
         {
             $installer::globals::epmoutpath = "freebsd";
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 16174750d178..f2edd8d0e830 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -387,7 +387,7 @@ sub create_registry_table
 
         $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
         installer::files::save_file($registrytablename ,\@reg64table );
-        my $infoline = "Created idt file: $registrytablename\n";
+        $infoline = "Created idt file: $registrytablename\n";
         push(@installer::globals::logfileinfo, $infoline);
     }
 }