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

[Norbert Thiebaud]

 solenv/bin/modules/installer/control.pm     |    3 +++
 solenv/bin/modules/installer/environment.pm |    3 +++
 solenv/bin/modules/installer/globals.pm     |    3 +++
 3 files changed, 9 insertions(+)

New commits:
commit 06c1844485f1d9fc4f3eb156ec7b871eebea8402
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 10 04:24:12 2014 -0500

    installer: populate installer::globals::[os,com,cpuname]
    
    with there respective env variable OS,COM,CPUNAME
    this is a first step to get rid of OUTPATH
    
    Change-Id: Idab4dd7b19deba5252390cbd2cb74dfff9efe64e
    Reviewed-on: https://gerrit.libreoffice.org/11907
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 3b77433..0cdb532 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -267,6 +267,9 @@ sub check_system_environment
     my @environmentvariables = qw(
         LIBO_VERSION_MAJOR
         LIBO_VERSION_MINOR
+        CPUNAME
+        OS
+        COM
         OUTPATH
         LOCAL_OUT
         LOCAL_COMMON_OUT
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 9347b9b..5e106b21 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -107,6 +107,9 @@ sub set_global_environment_variables
 
     $installer::globals::build = $environment->{'LIBO_VERSION_MAJOR'}.$environment->{'LIBO_VERSION_MINOR'}."0";
     $installer::globals::compiler = $environment->{'OUTPATH'};
+    $installer::globals::os = $environment->{'OS'};
+    $installer::globals::com = $environment->{'COM'};
+    $installer::globals::cpuname = $environment->{'CPUNAME};
 
     if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 2076e8b..8ceb563 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -40,6 +40,9 @@ BEGIN
     $minor = "";
     $lastminor = "";
     $compiler = "";
+    $os = "";
+    $cpuname = "";
+    $com = "";
     $pro = 0;
     $dounzip = 1;
     $languages_defined_in_productlist = 0;