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 /rhino | |
| 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 'rhino')
| -rw-r--r-- | rhino/ExternalProject_rhino.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk index 9b3703c663da..68e65b531da8 100644 --- a/rhino/ExternalProject_rhino.mk +++ b/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 \ |