Use SVN revision for NetWare dev builds version info.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1484051 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index d00c9717d24660fd93729bd7d86439ab979615b2..a8052551a67c7a3fec677080196736894e6bd81a 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -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"

diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index 09443461b58b8c59b6557de50d11e0e784bb451f..6cb404143c5920b8c72a96f3829a01c96b478663 100644 (file)
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -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 "";
 
 }