Set version number in AC_INIT() in configure.ac only

Output a solenv/inc/minor.mk based on that. Get rid of RSCVERSION and
RSCREVISION. Automate the end of the copyright year range, although I
am actually not sure if that is OK.

Change-Id: Ibae2d139b1dd468ee80d18a2a41b786a532df809

apache-commons/ExternalProject_apache_commons_codec.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec))
 
 $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_codec))
@@ -24,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

apache-commons/ExternalProject_apache_commons_httpclient.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient))
 
 $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_httpclient))
@@ -27,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar" \
 		-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.3.jar" \
 		$(if $(filter yes,$(JAVACISGCJ))\

apache-commons/ExternalProject_apache_commons_lang.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang))
 
 $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_lang,apache_commons_lang))
@@ -24,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

apache-commons/ExternalProject_apache_commons_logging.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
 
 $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging))
@@ -31,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter YES,$(SYSTEM_TOMCAT))\
 			,-Dservletapi.jar=$(SERVLETAPI_JAR) \
 			,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \

config_host.mk.in

@@ -303,6 +303,10 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
 export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
 export LIBMYSQL_PATH=@LIBMYSQL_PATH@
+export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
+export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
+export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
+export LIBO_VERSION_PATCH=@LIBO_VERSION_PATCH@
 export LIBPNG_CFLAGS=$(gb_SPACE)@LIBPNG_CFLAGS@
 export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@
 export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@

configure.ac

@@ -2,7 +2,11 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*
 dnl configure.ac serves as input for the GNU autoconf package
 dnl in order to create a configure script.
 
-AC_INIT([LibreOffice],[4.1],[],[],[http://documentfoundation.org/])
+# The version number in the second argumemnt to AC_INIT should be four numbers separated by
+# periods. Some parts of the code requires the first one to be less than 128 and the others to be less
+# than 256.
+AC_INIT([LibreOffice],[4.1.0.0],[],[],[http://documentfoundation.org/])
+
 AC_PREREQ([2.59])
 save_CC=$CC
 save_CXX=$CXX
@@ -4200,6 +4204,7 @@ if test "$cross_compiling" = "yes"; then
         solenv/bin/getcompver.awk \
         solenv/inc/langlist.mk \
         solenv/inc/postset.mk \
+        solenv/inc/minor.mk.in \
     | (cd CONF-FOR-BUILD && tar xf -)
     (
     unset COM GUI GUIBASE OS CPU CPUNAME
@@ -4314,28 +4319,39 @@ AC_SUBST([PYTHON_FOR_BUILD])
 AC_SUBST(OUTDIR_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
 
-UPD="`echo AC_PACKAGE_VERSION | sed "s/\.//"`0"
-SOURCEVERSION="OOO$UPD"
-AC_SUBST(UPD)
-AC_SUBST(SOURCEVERSION)
-
 dnl ===================================================================
-dnl Grim-ness to export version number of LibreOffice to code
-dnl this needs to be turned around and to be driven by configure
+dnl Our version is defined by the AC_INIT() at the top of this script.
 dnl ===================================================================
-LIBO_VERSION_MAJOR="`$GREP VERSIONMAJOR solenv/inc/minor.mk | sed "s/^.*=//"`"
-LIBO_VERSION_MINOR="`$GREP VERSIONMINOR solenv/inc/minor.mk | sed "s/^.*=//"`"
-LIBO_VERSION_MICRO="`$GREP VERSIONMICRO solenv/inc/minor.mk | sed "s/^.*=//"`"
-LIBO_VERSION_PATCH="`$GREP BUILD solenv/inc/minor.mk | sed "s/^.*=//"`"
+
+set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"`
+
+LIBO_VERSION_MAJOR=$1
+LIBO_VERSION_MINOR=$2
+LIBO_VERSION_MICRO=$3
+LIBO_VERSION_PATCH=$4
+
 AC_SUBST(LIBO_VERSION_MAJOR)
 AC_SUBST(LIBO_VERSION_MINOR)
 AC_SUBST(LIBO_VERSION_MICRO)
 AC_SUBST(LIBO_VERSION_PATCH)
+
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 
+LIBO_THIS_YEAR=`date +%Y`
+AC_SUBST(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 Check for syslog header
 dnl ===================================================================
@@ -12440,7 +12456,7 @@ else
     echo > config_host.mk.last
 fi
 
-AC_CONFIG_FILES([config_host.mk Makefile])
+AC_CONFIG_FILES([config_host.mk Makefile solenv/inc/minor.mk])
 AC_CONFIG_HEADERS([config/config_clang.h])
 AC_CONFIG_HEADERS([config/config_global.h])
 AC_CONFIG_HEADERS([config/config_graphite.h])

jfreereport/ExternalProject_jfreereport_flow_engine.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine))
 
 $(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flow_engine,jfreereport_flow_engine))
@@ -27,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\
 			,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
 		)\

jfreereport/ExternalProject_jfreereport_flute.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_libbase.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_libfonts.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_libformula.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_liblayout.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout))
 
 $(eval $(call gb_ExternalProject_use_unpacked,jfreereport_liblayout,jfreereport_liblayout))
@@ -41,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\
 			,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
 		)\

jfreereport/ExternalProject_jfreereport_libloader.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_librepository.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_libserializer.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_libxml.mk

@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
@@ -25,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

jfreereport/ExternalProject_jfreereport_sac.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac))
 
 $(eval $(call gb_ExternalProject_use_unpacked,jfreereport_sac,jfreereport_sac))
@@ -23,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

odk/pack/copying/makefile.mk

@@ -224,7 +224,7 @@ $(DESTDIRBIN)/addsym-macosx.sh : addsym-macosx.sh
 $(DESTDIRSETTINGS)/dk.mk : dk.mk
     @@-rm -f $@
     -$(MKDIRHIER) $(@:d)
-    tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
+    tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/'> $@
 
 $(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST)
     @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF)

offapi/UnoApiMerge_types.mk

@@ -32,6 +32,6 @@ $(eval $(call gb_UnoApiMerge_set_reference_rdbfile,types,\
 statistic : $(gb_Helper_MISC)/api_statistic
 
 $(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiMerge_get_target,types)
-	$(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@
+	$(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@
 
 # vim: set noet sw=4 ts=4:

rhino/ExternalProject_rhino.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,rhino))
 
 $(eval $(call gb_ExternalProject_use_unpacked,rhino,rhino))
@@ -23,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,rhino,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		-DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \

solenv/gbuild/Jar.mk

@@ -58,7 +58,7 @@ define gb_Jar__command
 	mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \
 	echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
 	$(if $(JARCLASSPATH),echo "Class-Path: $(strip $(JARCLASSPATH))" >> $(call gb_Jar_get_manifest_target,$(1)) &&) \
-	echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
+	echo "Solar-Version: $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
 	$(if $(MANIFEST),cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) &&) \
 	mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \
 	$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \

solenv/inc/ant.mk

@@ -56,8 +56,6 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA
 $(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg $(SOLARENV)/inc/ant.properties
     @echo "Making:   " $@
     @echo solar.build=$(BUILD) > $@
-    @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
-    @echo solar.rscrevision=$(USQ)$(RSCREVISION)$(USQ) >> $@
     @echo solar.minor=$(LAST_MINOR) >> $@
     @echo solar.sourceversion=$(SOURCEVERSION) >> $@
     @echo solar.udkstamp=$(UDKSTAMP) >> $@

solenv/inc/minor.mk

-RSCVERSION=410
-RSCREVISION=410m1(Build:0)
-BUILD=0
-LAST_MINOR=m0
-SOURCEVERSION=OOO410
-
-VERSIONMAJOR=4
-VERSIONMINOR=1
-VERSIONMICRO=0
-
-COPYRIGHTYEARRANGE=2000-2013

solenv/inc/minor.mk.in

+BUILD=@LIBO_VERSION_PATCH@
+LAST_MINOR=m0
+SOURCEVERSION=OOO410
+
+VERSIONMAJOR=@LIBO_VERSION_MAJOR@
+VERSIONMINOR=@LIBO_VERSION_MINOR@
+VERSIONMICRO=@LIBO_VERSION_MICRO@
+
+COPYRIGHTYEARRANGE=2000-@LIBO_THIS_YEAR@

solenv/inc/settings.mk

@@ -884,10 +884,6 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
 COMPILE_ECHO_SWITCH=
 COMPILE_ECHO_FILE=$(<:f)
 
-#new
-RSCUPDVER=$(RSCREVISION)
-RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
-
 RSCFLAGS=-s
 RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF)
 

solenv/inc/target.mk

@@ -1829,7 +1829,6 @@ $(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
     @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP)
     @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)"                 >> $(VERSIONTMP)
     @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
-    @echo $(EMQ)#define _RSCREVISION $(EMQ)"$(USQ)$(RSCREVISION)$(USQ)$(EMQ)" >> $(VERSIONTMP)
     @echo $(EMQ)#define _INPATH $(EMQ)"$(INPATH)$(EMQ)"           >> $(VERSIONTMP)
     @@-$(RM) $(@)_$(VERSIONTMP:b)
     @$(TYPE) $(VERSIONTMP) > $(@)_$(VERSIONTMP:b)

solenv/inc/tg_jar.mk

@@ -56,8 +56,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
 .IF "$(JARCLASSPATH)" != ""
     $(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
 .ENDIF
-# $(RSCREVISION) contains chars that must be quoted (for *NIX shells)
-    $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@
+    $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(USQ) >> $@
 .IF "$(CUSTOMMANIFESTFILE)"!=""
     $(COMMAND_ECHO)$(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""

solenv/inc/tg_java.mk

@@ -34,10 +34,10 @@ $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
     @-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd
 .IF "$(OS)"!="WNT"
     @echo package com.sun.star.upd\; > $@
-    @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";}' >> $@
+    @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)";}' >> $@
 .ELSE			# "$(OS)"!="WNT"
     @echo package com.sun.star.upd; > $@
-    @echo public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";} >> $@
+    @echo public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)";} >> $@
 .ENDIF			# "$(OS)"!="WNT"
 
 .IF "$(JAVATARGET)"!=""

solenv/inc/tg_srs.mk

@@ -26,7 +26,7 @@ $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -48,7 +48,7 @@ $(SRS)/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \
         -fp=$@.$(INPATH) \
         $< \
     )

tomcat/ExternalProject_tomcat.mk

@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,tomcat))
 
 $(eval $(call gb_ExternalProject_use_unpacked,tomcat,tomcat))
@@ -23,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,tomcat,build) :
 	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \