mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill UPD,SOURCEVERION and WORK_STAMP

Browse Source 
Change-Id: Icea7057734020914fe0df3df70c8a895e96c1af0
This commit is contained in:
Norbert Thiebaud
2014-07-08 21:31:38 +02:00
parent 005ed48e70
commit 38e6216cfd
5 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config_host.mk.in
View File

@@ -580,7 +580,6 @@ export TLS=@TLS@
export TMPDIR=@TEMP_DIRECTORY@ export TMPDIR=@TEMP_DIRECTORY@
export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
export UNOWINREG_DLL=@UNOWINREG_DLL@ export UNOWINREG_DLL=@UNOWINREG_DLL@
export UPD=@UPD@
export URELIBS=@URELIBS@ export URELIBS=@URELIBS@
export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@ export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
export USE_XINERAMA=@USE_XINERAMA@ export USE_XINERAMA=@USE_XINERAMA@
@@ -623,7 +622,6 @@ export WITH_THEMES=@WITH_THEMES@
export WITH_WEBDAV=@WITH_WEBDAV@ export WITH_WEBDAV=@WITH_WEBDAV@
export WORKDIR=@WORKDIR@ export WORKDIR=@WORKDIR@
export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@ export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
export WORK_STAMP=@SOURCEVERSION@
export WPD_CFLAGS=$(gb_SPACE)@WPD_CFLAGS@ export WPD_CFLAGS=$(gb_SPACE)@WPD_CFLAGS@
export WPD_LIBS=$(gb_SPACE)@WPD_LIBS@ export WPD_LIBS=$(gb_SPACE)@WPD_LIBS@
export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@ export WPG_CFLAGS=$(gb_SPACE)@WPG_CFLAGS@

8
configure.ac
View File

@@ -164,14 +164,6 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
LIBO_THIS_YEAR=`date +%Y` LIBO_THIS_YEAR=`date +%Y`
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR) 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 ===================================================================
dnl Product version dnl Product version
dnl =================================================================== dnl ===================================================================

3
solenv/bin/modules/installer/control.pm
View File

@@ -265,7 +265,8 @@ sub check_system_environment
my $error = 0; my $error = 0;
my @environmentvariables = qw( my @environmentvariables = qw(
WORK_STAMP LIBO_VERSION_MAJOR
LIBO_VERSION_MINOR
OUTPATH OUTPATH
LOCAL_OUT LOCAL_OUT
LOCAL_COMMON_OUT LOCAL_COMMON_OUT

2
solenv/bin/modules/installer/environment.pm
View File

@@ -107,7 +107,7 @@ sub set_global_environment_variables
{ {
my ( $environment ) = @_; 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'}; $installer::globals::compiler = $environment->{'OUTPATH'};
if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; } if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }

2
solenv/gbuild/gbuild.mk
View File

@@ -206,7 +206,7 @@ gb_CPUDEFS += -D$(CPUNAME)
gb_GLOBALDEFS := \ gb_GLOBALDEFS := \
-D_REENTRANT \ -D_REENTRANT \
-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-DSUPD=$(UPD) \ -DSUPD=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0 \
$(gb_OSDEFS) \ $(gb_OSDEFS) \
$(gb_COMPILERDEFS) \ $(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \ $(gb_CPUDEFS) \