diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 15:07:10 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 15:07:10 +0200 |
| commit | f5cde53719544c7445ab6fdb465e332ac5678b02 (patch) | |
| tree | 5837c8e919f7079e418a2ebba0d04465951f099e /apache-commons | |
| parent | 3c91ac17ae401a1a2bb5752892fb108872096160 (diff) | |
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
Diffstat (limited to 'apache-commons')
4 files changed, 4 insertions, 16 deletions
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk index 950c2f4591aa..59d53e5526f4 100644 --- a/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/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) \ diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk index c9bde3f8b485..c3c1513ad3f0 100644 --- a/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/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))\ diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk index f2547aa2fbe4..b343dc71e47e 100644 --- a/apache-commons/ExternalProject_apache_commons_lang.mk +++ b/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) \ diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk index a75558eaa0b4..6895e39d2e53 100644 --- a/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/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 \ |