From 38e6216cfd04f23ca0dbfa6bb99c5631f4891e78 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Tue, 8 Jul 2014 21:31:38 +0200
Subject: kill UPD,SOURCEVERION and WORK_STAMP

Change-Id: Icea7057734020914fe0df3df70c8a895e96c1af0
---
 config_host.mk.in                           | 2 --
 configure.ac                                | 8 --------
 solenv/bin/modules/installer/control.pm     | 3 ++-
 solenv/bin/modules/installer/environment.pm | 2 +-
 solenv/gbuild/gbuild.mk                     | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/config_host.mk.in b/config_host.mk.in
index 872172ee4efe..316f56a7862d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -580,7 +580,6 @@ export TLS=@TLS@
 export TMPDIR=@TEMP_DIRECTORY@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
-export UPD=@UPD@
 export URELIBS=@URELIBS@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
@@ -623,7 +622,6 @@ export WITH_THEMES=@WITH_THEMES@
 export WITH_WEBDAV=@WITH_WEBDAV@
 export WORKDIR=@WORKDIR@
 export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
-export WORK_STAMP=@SOURCEVERSION@
 export WPD_CFLAGS=$(gb_SPACE)@WPD_CFLAGS@
 export WPD_LIBS=$(gb_SPACE)@WPD_LIBS@
 export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@
diff --git a/configure.ac b/configure.ac
index e5153eaa05c4..16c0ccacc424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,14 +164,6 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 LIBO_THIS_YEAR=`date +%Y`
 AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
-# This UPD silly thing must go away soon
-UPD="${LIBO_VERSION_MAJOR}${LIBO_VERSION_MINOR}0"
-AC_SUBST(UPD)
-
-# This too should go away
-SOURCEVERSION="OOO$UPD"
-AC_SUBST(SOURCEVERSION)
-
 dnl ===================================================================
 dnl Product version
 dnl ===================================================================
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) \
-- 
cgit v1.2.3