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 2009/07/11 17:38:00 UTC
svn commit: r793185 - in /httpd/httpd/branches/2.2.x/build: NWGNUtail.inc
nw_ver.awk
Author: fuankg
Date: Sat Jul 11 15:37:59 2009
New Revision: 793185
URL: http://svn.apache.org/viewvc?rev=793185&view=rev
Log:
improved NetWare version script; fixed defaults;
avoid to create version include with clean target.
Modified:
httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
httpd/httpd/branches/2.2.x/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=793185&r1=793184&r2=793185&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUtail.inc Sat Jul 11 15:37:59 2009
@@ -58,7 +58,7 @@
$(EOLIST)
ifeq "$(words $(strip $(TARGET_lib)))" "1"
-LIB_NAME = $(basename $(notdir $(TARGET_lib)))
+LIB_NAME = $(basename $(notdir $(TARGET_lib)))
$(LIB_NAME)_LIBLST_DEPENDS = \
$(FILES_lib_objs) \
$(AP_WORK)\build\NWGNUenvironment.inc \
@@ -82,17 +82,20 @@
# Generic compiler rules
#
-$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\include\ap_release.h $(AP_WORK)\build\nw_ver.awk
+ifneq ($(MAKECMDGOALS),clean)
+$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h
@echo Generating $(subst /,\,$@)
- $(AWK) -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc
+ $(AWK) -f $^ > $@
-include $(AP_WORK)\build\NWGNUversion.inc
ifneq "$(strip $(VERSION_STR))" ""
VERSION_INC = $(AP_WORK)\build\NWGNUversion.inc
else
-VERSION = 2,0,0
-VERSION_STR = 2.0.0
+VERSION = 2,2,0
+VERSION_STR = 2.2.0
+VERSION_MAJMIN = 22
+endif
endif
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=793185&r1=793184&r2=793185&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/nw_ver.awk (original)
+++ httpd/httpd/branches/2.2.x/build/nw_ver.awk Sat Jul 11 15:37:59 2009
@@ -14,11 +14,15 @@
# limitations under the License.
BEGIN {
-
- # fetch Apache version numbers from input file and writes them to STDOUT
+ # fetch Apache version numbers from input file and write them to STDOUT
while ((getline < ARGV[1]) > 0) {
- if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
+ if (match ($0, /^#define AP_SERVER_COPYRIGHT \\/)) {
+ if (((getline < ARGV[1]) > 0) && (split($0, c, "\"") == 3)) {
+ copyright_str = c[2];
+ }
+ }
+ else if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
ver_major = $3;
}
else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) {
@@ -36,6 +40,8 @@
print "VERSION = " ver_nlm "";
print "VERSION_STR = " ver_str "";
+ print "VERSION_MAJMIN = " ver_major ver_minor "";
+ print "COPYRIGHT_STR = " copyright_str "";
}