diff options
| author | Guenter Knauf <fuankg@apache.org> | 2013-05-14 00:51:01 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2013-05-14 00:51:01 +0000 |
| commit | c3a459a2d3e538e4013ee71066cf0b9fa8ed47f3 (patch) | |
| tree | e686becbd6c4468b7155d91ce83d998f158c32e8 /build | |
| parent | d2e6782ea7a74046a0e30aa2b9b0f85e86396fff (diff) | |
| download | httpd-c3a459a2d3e538e4013ee71066cf0b9fa8ed47f3.tar.gz | |
Use SVN revision for NetWare dev builds version info.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482160 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUtail.inc | 5 | ||||
| -rw-r--r-- | build/nw_ver.awk | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 21ae22906b..be67989cdb 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -97,7 +97,7 @@ CPPOPT_DEPENDS = $(CCOPT_DEPENDS) ifneq "$(MAKECMDGOALS)" "clean" ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_" -$(APBUILD)/NWGNUversion.inc: $(APBUILD)/nw_ver.awk $(SRC)/include/ap_release.h +$(APBUILD)/NWGNUversion.inc: $(APBUILD)/nw_ver.awk $(SRC)/include/ap_release.h $(SRC)/.svn/all-wcprops @echo $(DL)GEN $@$(DL) $(AWK) -f $^ > $@ @@ -112,6 +112,9 @@ VERSION_MAJMIN = 25 endif endif endif +ifneq "$(strip $(SVN_REVISION))" "" +CFLAGS += -DAP_SERVER_ADD_STRING=\"$(SVN_REVISION)\" +endif ifeq "$(words $(strip $(TARGET_nlm)))" "1" diff --git a/build/nw_ver.awk b/build/nw_ver.awk index 385cd658cd..22c7bc431c 100644 --- a/build/nw_ver.awk +++ b/build/nw_ver.awk @@ -35,13 +35,27 @@ BEGIN { ver_devbuild = $3; } } + + if (ver_devbuild) { + ver_dev = "-dev" + if (ARGV[2]) { + while ((getline < ARGV[2]) > 0) { + if (match ($0, /^\/repos\/asf\/!svn\/ver\/[0-9]+\/httpd\/httpd\/(trunk|branches\/[0-9]\.[0-9]\.x)$/)) { + gsub(/^\/repos\/asf\/!svn\/ver\/|\/httpd\/httpd\/(trunk|branches\/[0-9]\.[0-9]\.x)$/, "", $0) + ver_dev = svn_rev = "-r" $0 + } + } + } + } + ver_nlm = ver_major "," ver_minor "," ver_patch; - ver_str = ver_major "." ver_minor "." ver_patch (ver_devbuild ? "-dev" : ""); + ver_str = ver_major "." ver_minor "." ver_patch ver_dev; print "VERSION = " ver_nlm ""; print "VERSION_STR = " ver_str ""; print "VERSION_MAJMIN = " ver_major ver_minor ""; print "COPYRIGHT_STR = " copyright_str ""; + print "SVN_REVISION = " svn_rev ""; } |