set 1.4.0 release version

sayer/1.4-spce2.6
Stefan Sayer 15 years ago
parent 122b7aa045
commit e30657f73f

@ -3,29 +3,29 @@ else
makefile_defs=1
export makefile_defs
GIT = $(shell which git)
SVNVERSION = $(shell which svnversion)
ifneq ($(GIT),)
SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
then git describe --always --dirty 2>/dev/null; \
else git describe --always 2>/dev/null; fi)
endif
ifeq ($(SCM_REV),)
ifneq ($(SVNVERSION),)
SCM_REV = r$(shell svnversion -n .)
endif
endif
#GIT = $(shell which git)
#SVNVERSION = $(shell which svnversion)
#
#ifneq ($(GIT),)
# SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \
# then git describe --always --dirty 2>/dev/null; \
# else git describe --always 2>/dev/null; fi)
#endif
#
#ifeq ($(SCM_REV),)
#ifneq ($(SVNVERSION),)
# SCM_REV = r$(shell svnversion -n .)
#endif
#endif
#version number
VERSION = 1
PATCHLEVEL = 4
SUBLEVEL = 0
ifneq ($(SCM_REV),)
EXTRAVERSION = -dev-$(SCM_REV)
endif
#ifneq ($(SCM_REV),)
#EXTRAVERSION = -dev-$(SCM_REV)
#endif
REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
RELEASE=$(REL_VERSION)$(EXTRAVERSION)

Loading…
Cancel
Save