www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity

Use SVN revision for NetWare dev builds version info.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482160 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guenter Knauf
2013-05-14 00:51:01 +00:00
parent d2e6782ea7
commit c3a459a2d3
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/NWGNUtail.inc
View File

@@ -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"

16
build/nw_ver.awk
View File

@@ -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 "";
}