summaryrefslogtreecommitdiff
path: root/apache-commons/ExternalProject_apache_commons_logging.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-11 15:07:10 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-11 15:07:10 +0200
commitf5cde53719544c7445ab6fdb465e332ac5678b02 (patch)
tree5837c8e919f7079e418a2ebba0d04465951f099e /apache-commons/ExternalProject_apache_commons_logging.mk
parent3c91ac17ae401a1a2bb5752892fb108872096160 (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/ExternalProject_apache_commons_logging.mk')
-rw-r--r--apache-commons/ExternalProject_apache_commons_logging.mk5
1 files changed, 1 insertions, 4 deletions
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 \