diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-08 21:31:38 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-08 23:22:19 +0200 |
| commit | 38e6216cfd04f23ca0dbfa6bb99c5631f4891e78 (patch) | |
| tree | 98626be1562557bdd4f8f306ab4d6161e1f8a825 /solenv | |
| parent | drop unused helpids (diff) | |
| download | core-38e6216cfd04f23ca0dbfa6bb99c5631f4891e78.tar.gz core-38e6216cfd04f23ca0dbfa6bb99c5631f4891e78.zip | |
kill UPD,SOURCEVERION and WORK_STAMP
Change-Id: Icea7057734020914fe0df3df70c8a895e96c1af0
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 1076c8f27d6a..660863a19cd6 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -265,7 +265,8 @@ sub check_system_environment my $error = 0; my @environmentvariables = qw( - WORK_STAMP + LIBO_VERSION_MAJOR + LIBO_VERSION_MINOR OUTPATH LOCAL_OUT LOCAL_COMMON_OUT diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index cce32e4ab746..671ef612863d 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -107,7 +107,7 @@ sub set_global_environment_variables { my ( $environment ) = @_; - $installer::globals::build = $environment->{'WORK_STAMP'}; + $installer::globals::build = $environment->{'LIBO_VERSION_MAJOR'}.$environment->{'LIBO-VERSION_MINOR'}."0"; $installer::globals::compiler = $environment->{'OUTPATH'}; if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; } diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 0ef0a505a352..52539aeefc28 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -206,7 +206,7 @@ gb_CPUDEFS += -D$(CPUNAME) gb_GLOBALDEFS := \ -D_REENTRANT \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ - -DSUPD=$(UPD) \ + -DSUPD=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0 \ $(gb_OSDEFS) \ $(gb_COMPILERDEFS) \ $(gb_CPUDEFS) \ |