svn commit: r1484051 - in /httpd/httpd/branches/2.0.x/build: NWGNUtail.inc nw_ver.awk

[fu...@apache.org]

Author: fuankg
Date: Sat May 18 03:21:50 2013
New Revision: 1484051

URL: http://svn.apache.org/r1484051
Log:
Use SVN revision for NetWare dev builds version info.

Modified:
    httpd/httpd/branches/2.0.x/build/NWGNUtail.inc
    httpd/httpd/branches/2.0.x/build/nw_ver.awk

Modified: httpd/httpd/branches/2.0.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/build/NWGNUtail.inc?rev=1484051&r1=1484050&r2=1484051&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.0.x/build/NWGNUtail.inc Sat May 18 03:21:50 2013
@@ -101,9 +101,11 @@ endif
 # Generic compiler rules
 #
 
-$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\include\ap_release.h $(AP_WORK)\build\nw_ver.awk
-	@echo Generating $(subst /,\,$@)
-	awk -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc
+ifneq "$(MAKECMDGOALS)" "clean"
+ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"
+$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h
+	@echo $(DL)GEN  $@$(DL)
+	$(AWK) -f $^ $(SRC)/.svn/all-wcprops > $@
 
 -include $(AP_WORK)\build\NWGNUversion.inc
 
@@ -113,6 +115,13 @@ else
 VERSION		= 2,0,0
 VERSION_STR	= 2.0.0
 endif
+endif
+endif
+ifeq "$(USE_SVNREV)" "1"
+ifneq "$(strip $(SVN_REVISION))" ""
+CFLAGS	+= -DAP_SERVER_ADD_STRING=\"$(SVN_REVISION)\"
+endif
+endif
 
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"

Modified: httpd/httpd/branches/2.0.x/build/nw_ver.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/build/nw_ver.awk?rev=1484051&r1=1484050&r2=1484051&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/nw_ver.awk (original)
+++ httpd/httpd/branches/2.0.x/build/nw_ver.awk Sat May 18 03:21:50 2013
@@ -35,6 +35,18 @@ BEGIN {
         ver_str_release = substr($3, 2, length($3) - 2);
     }
   }
+
+  if (ver_str_release) {
+    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_str_release = svn_rev = "-r" $0
+        }
+      }
+    }
+  }
+
   ver_nlm = ver_major "," ver_minor "," ver_patch;
   ver_str = ver_major "." ver_minor "." ver_patch ver_str_release;
 
@@ -42,6 +54,7 @@ BEGIN {
   print "VERSION_STR = " ver_str "";
   print "VERSION_MAJMIN = " ver_major ver_minor "";
   print "COPYRIGHT_STR = " copyright_str "";
+  print "SVN_REVISION = " svn_rev "";
 
 }