httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1210926 - in /httpd/httpd: branches/2.4.x/build/ branches/2.4.x/modules/cache/ trunk/build/ trunk/modules/cache/
Date Tue, 06 Dec 2011 14:18:02 GMT
Author: fuankg
Date: Tue Dec  6 14:18:01 2011
New Revision: 1210926

URL: http://svn.apache.org/viewvc?rev=1210926&view=rev
Log:
NetWare build fixes.

Create mod_cache.imp dynamically; fixed mod_cache_disk NLM name.

Modified:
    httpd/httpd/branches/2.4.x/build/NWGNUmakefile
    httpd/httpd/branches/2.4.x/build/make_nw_export.awk
    httpd/httpd/branches/2.4.x/modules/cache/NWGNUcach_dsk
    httpd/httpd/branches/2.4.x/modules/cache/mod_cache.imp
    httpd/httpd/trunk/build/NWGNUmakefile
    httpd/httpd/trunk/build/make_nw_export.awk
    httpd/httpd/trunk/modules/cache/NWGNUcach_dsk
    httpd/httpd/trunk/modules/cache/mod_cache.imp

Modified: httpd/httpd/branches/2.4.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/NWGNUmakefile?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/build/NWGNUmakefile Tue Dec  6 14:18:01 2011
@@ -23,7 +23,7 @@ FILES_prebuild_headers = \
 	$(PCRE)/pcre.h \
 	$(EOLIST) 
     
-nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp
+nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp
 
 libs :: chkapr $(NWOS)/chartables.c
 
@@ -31,6 +31,10 @@ $(DAV)/main/dav.imp : make_nw_export.awk
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
 
+$(STDMOD)/cache/mod_cache.imp: make_nw_export.awk $(STDMOD)/cache/mod_cache.h $(STDMOD)/cache/cache_util.h
+	@echo $(DL)GEN  $@$(DL)
+	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
+
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
@@ -114,6 +118,7 @@ clean ::
 	$(call DEL,$(SRC)/include/ap_config_layout.h)
 	$(call DEL,$(PCRE)/config.h)
 	$(call DEL,$(PCRE)/pcre.h)
+	$(call DEL,$(STDMOD)/cache/mod_cache.imp)
 	$(call DEL,$(DAV)/main/dav.imp)
 	$(call DEL,$(NWOS)/httpd.imp)
 	$(call DEL,nw_export.i)

Modified: httpd/httpd/branches/2.4.x/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/make_nw_export.awk?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/make_nw_export.awk (original)
+++ httpd/httpd/branches/2.4.x/build/make_nw_export.awk Tue Dec  6 14:18:01 2011
@@ -29,8 +29,8 @@ function add_symbol(sym_name) {
 #/ap_some_name/{next}
 /ap_mpm_pod_/{next}
 
-/^[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
+/^[ \t]*(AP|DAV|CACHE)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
+    sub("[ \t]*(AP|DAV|CACHE)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
     sub("[(].*", "")
     sub("([^ ]* (^([ \t]*[(])))+", "")
     add_symbol($0)

Modified: httpd/httpd/branches/2.4.x/modules/cache/NWGNUcach_dsk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/NWGNUcach_dsk?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/NWGNUcach_dsk (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/NWGNUcach_dsk Tue Dec  6 14:18:01 2011
@@ -99,7 +99,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME	= dsk_cach
+NLM_NAME	= cach_dsk
 
 #
 # This is used by the link '-desc ' directive.
@@ -111,7 +111,7 @@ NLM_DESCRIPTION	= Apache $(VERSION_STR) 
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= dsk_cach
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # If this is specified, it will override VERSION value in
@@ -160,7 +160,7 @@ XDCDATA		=
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/dsk_cach.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache.imp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache.imp?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache.imp (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache.imp Tue Dec  6 14:18:01 2011
@@ -1,12 +0,0 @@
- (MODCACHE)
- ap_cache_check_allowed,
- ap_cache_current_age,
- ap_cache_liststr,
- ap_cache_tokstr,
- ap_cache_hex2usec,
- ap_cache_usec2hex,
- ap_cache_generate_name,
- ap_cache_cacheable_headers,
- ap_cache_cacheable_headers_in,
- ap_cache_cacheable_headers_out
-

Modified: httpd/httpd/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUmakefile?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUmakefile (original)
+++ httpd/httpd/trunk/build/NWGNUmakefile Tue Dec  6 14:18:01 2011
@@ -23,7 +23,7 @@ FILES_prebuild_headers = \
 	$(PCRE)/pcre.h \
 	$(EOLIST) 
     
-nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp
+nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp
 
 libs :: chkapr $(NWOS)/chartables.c
 
@@ -31,6 +31,10 @@ $(DAV)/main/dav.imp : make_nw_export.awk
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
 
+$(STDMOD)/cache/mod_cache.imp: make_nw_export.awk $(STDMOD)/cache/mod_cache.h $(STDMOD)/cache/cache_util.h
+	@echo $(DL)GEN  $@$(DL)
+	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
+
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
@@ -114,6 +118,7 @@ clean ::
 	$(call DEL,$(SRC)/include/ap_config_layout.h)
 	$(call DEL,$(PCRE)/config.h)
 	$(call DEL,$(PCRE)/pcre.h)
+	$(call DEL,$(STDMOD)/cache/mod_cache.imp)
 	$(call DEL,$(DAV)/main/dav.imp)
 	$(call DEL,$(NWOS)/httpd.imp)
 	$(call DEL,nw_export.i)

Modified: httpd/httpd/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/make_nw_export.awk?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/trunk/build/make_nw_export.awk (original)
+++ httpd/httpd/trunk/build/make_nw_export.awk Tue Dec  6 14:18:01 2011
@@ -29,8 +29,8 @@ function add_symbol(sym_name) {
 #/ap_some_name/{next}
 /ap_mpm_pod_/{next}
 
-/^[ \t]*(AP|DAV)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*(AP|DAV)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
+/^[ \t]*(AP|DAV|CACHE)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
+    sub("[ \t]*(AP|DAV|CACHE)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
     sub("[(].*", "")
     sub("([^ ]* (^([ \t]*[(])))+", "")
     add_symbol($0)

Modified: httpd/httpd/trunk/modules/cache/NWGNUcach_dsk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUcach_dsk?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUcach_dsk (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUcach_dsk Tue Dec  6 14:18:01 2011
@@ -99,7 +99,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME	= dsk_cach
+NLM_NAME	= cach_dsk
 
 #
 # This is used by the link '-desc ' directive.
@@ -111,7 +111,7 @@ NLM_DESCRIPTION	= Apache $(VERSION_STR) 
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= dsk_cach
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # If this is specified, it will override VERSION value in
@@ -160,7 +160,7 @@ XDCDATA		=
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/dsk_cach.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/cache/mod_cache.imp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.imp?rev=1210926&r1=1210925&r2=1210926&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.imp (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.imp Tue Dec  6 14:18:01 2011
@@ -1,12 +0,0 @@
- (MODCACHE)
- ap_cache_check_allowed,
- ap_cache_current_age,
- ap_cache_liststr,
- ap_cache_tokstr,
- ap_cache_hex2usec,
- ap_cache_usec2hex,
- ap_cache_generate_name,
- ap_cache_cacheable_headers,
- ap_cache_cacheable_headers_in,
- ap_cache_cacheable_headers_out
-



Mime
View raw message