diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-10-10 04:24:12 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-10-10 23:28:08 +0000 |
| commit | 06c1844485f1d9fc4f3eb156ec7b871eebea8402 (patch) | |
| tree | e78c69ecc2f02cc01bfce74d46a2c13ea5806198 | |
| parent | d9b325f6b53db502e197feb4e50f59bf57682bbd (diff) | |
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@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 3b77433d71e0..0cdb532acb52 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 9347b9ba883c..5e106b212ee3 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 2076e8bd7f9b..8ceb563165b2 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; |