You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2013/05/14 02:51:01 UTC
svn commit: r1482160 - in /httpd/httpd: branches/2.2.x/build/NWGNUtail.inc
branches/2.2.x/build/nw_ver.awk branches/2.4.x/build/NWGNUtail.inc
branches/2.4.x/build/nw_ver.awk trunk/build/NWGNUtail.inc
trunk/build/nw_ver.awk
Author: fuankg
Date: Tue May 14 00:51:01 2013
New Revision: 1482160
URL: http://svn.apache.org/r1482160
Log:
Use SVN revision for NetWare dev builds version info.
Modified:
httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
httpd/httpd/branches/2.2.x/build/nw_ver.awk
httpd/httpd/branches/2.4.x/build/NWGNUtail.inc
httpd/httpd/branches/2.4.x/build/nw_ver.awk
httpd/httpd/trunk/build/NWGNUtail.inc
httpd/httpd/trunk/build/nw_ver.awk
Modified: httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUtail.inc?rev=1482160&r1=1482159&r2=1482160&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUtail.inc Tue May 14 00:51:01 2013
@@ -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 = 22
endif
endif
endif
+ifneq "$(strip $(SVN_REVISION))" ""
+CFLAGS += -DAP_SERVER_ADD_STRING=\"$(SVN_REVISION)\"
+endif
ifeq "$(words $(strip $(TARGET_nlm)))" "1"
Modified: httpd/httpd/branches/2.2.x/build/nw_ver.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/nw_ver.awk?rev=1482160&r1=1482159&r2=1482160&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/nw_ver.awk (original)
+++ httpd/httpd/branches/2.2.x/build/nw_ver.awk Tue May 14 00:51:01 2013
@@ -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 "";
}
Modified: httpd/httpd/branches/2.4.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/NWGNUtail.inc?rev=1482160&r1=1482159&r2=1482160&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.4.x/build/NWGNUtail.inc Tue May 14 00:51:01 2013
@@ -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 = 24
endif
endif
endif
+ifneq "$(strip $(SVN_REVISION))" ""
+CFLAGS += -DAP_SERVER_ADD_STRING=\"$(SVN_REVISION)\"
+endif
ifeq "$(words $(strip $(TARGET_nlm)))" "1"
Modified: httpd/httpd/branches/2.4.x/build/nw_ver.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/nw_ver.awk?rev=1482160&r1=1482159&r2=1482160&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/nw_ver.awk (original)
+++ httpd/httpd/branches/2.4.x/build/nw_ver.awk Tue May 14 00:51:01 2013
@@ -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 "";
}
Modified: httpd/httpd/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUtail.inc?rev=1482160&r1=1482159&r2=1482160&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUtail.inc (original)
+++ httpd/httpd/trunk/build/NWGNUtail.inc Tue May 14 00:51:01 2013
@@ -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"
Modified: httpd/httpd/trunk/build/nw_ver.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/nw_ver.awk?rev=1482160&r1=1482159&r2=1482160&view=diff
==============================================================================
--- httpd/httpd/trunk/build/nw_ver.awk (original)
+++ httpd/httpd/trunk/build/nw_ver.awk Tue May 14 00:51:01 2013
@@ -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 "";
}