Kaydet (Commit) 06c18444 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

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/11907Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst d9b325f6
...@@ -267,6 +267,9 @@ sub check_system_environment ...@@ -267,6 +267,9 @@ sub check_system_environment
my @environmentvariables = qw( my @environmentvariables = qw(
LIBO_VERSION_MAJOR LIBO_VERSION_MAJOR
LIBO_VERSION_MINOR LIBO_VERSION_MINOR
CPUNAME
OS
COM
OUTPATH OUTPATH
LOCAL_OUT LOCAL_OUT
LOCAL_COMMON_OUT LOCAL_COMMON_OUT
......
...@@ -107,6 +107,9 @@ sub set_global_environment_variables ...@@ -107,6 +107,9 @@ sub set_global_environment_variables
$installer::globals::build = $environment->{'LIBO_VERSION_MAJOR'}.$environment->{'LIBO_VERSION_MINOR'}."0"; $installer::globals::build = $environment->{'LIBO_VERSION_MAJOR'}.$environment->{'LIBO_VERSION_MINOR'}."0";
$installer::globals::compiler = $environment->{'OUTPATH'}; $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'}; } if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
......
...@@ -40,6 +40,9 @@ BEGIN ...@@ -40,6 +40,9 @@ BEGIN
$minor = ""; $minor = "";
$lastminor = ""; $lastminor = "";
$compiler = ""; $compiler = "";
$os = "";
$cpuname = "";
$com = "";
$pro = 0; $pro = 0;
$dounzip = 1; $dounzip = 1;
$languages_defined_in_productlist = 0; $languages_defined_in_productlist = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment