diff options
Diffstat (limited to '')
| -rw-r--r-- | build/NWGNUenvironment.inc | 1 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 7 | ||||
| -rw-r--r-- | build/make_nw_export.awk | 12 | ||||
| -rw-r--r-- | modules/dav/main/dav.imp | 64 |
4 files changed, 14 insertions, 70 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 728c427b16..2b0cc70ec2 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -357,6 +357,7 @@ APRUTIL = $(subst \,/,$(APU_WORK)) APBUILD = $(SRC)/build STDMOD = $(SRC)/modules HTTPD = $(SRC)/modules/http +DAV = $(SRC)/modules/dav NWOS = $(SRC)/os/netware SERVER = $(SRC)/server SUPMOD = $(SRC)/support diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 30a1fd4e5c..8d730d6b29 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -22,10 +22,14 @@ FILES_prebuild_headers = \ $(PCRE)/pcre.h \ $(EOLIST) -nlms :: libs $(NWOS)/httpd.imp +nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp libs :: chkapr $(NWOS)/chartables.c +$(DAV)/main/dav.imp : make_nw_export.awk $(DAV)/main/mod_dav.h + @echo $(DL)GEN $@$(DL) + $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | $(SORT) >$@ + $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i @echo $(DL)GEN $@$(DL) $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | $(SORT) >$@ @@ -104,6 +108,7 @@ install :: nlms FORCE clean :: $(call DEL,$(PCRE)/config.h) $(call DEL,$(PCRE)/pcre.h) + $(call DEL,$(DAV)/main/dav.imp) $(call DEL,$(NWOS)/httpd.imp) $(call DEL,nw_export.i) $(call DEL,cc.opt) diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index 628ea60ff1..9386c7b558 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -25,8 +25,8 @@ BEGIN { #/ap_some_name/{next} /ap_mpm_pod_/{next} -/^[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { - sub("[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") +/^[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { + sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") sub("[(].*", "") sub("([^ ]* (^([ \t]*[(])))+", "") add_symbol($0) @@ -46,12 +46,14 @@ BEGIN { /^[ \t]*AP[RU]?_DECLARE_EXTERNAL_HOOK[^(]*[(][^)]*/ { split($0, args, ",") + prefix = args[1] + sub("^.*[(]", "", prefix) symbol = args[4] sub("^[ \t]+", "", symbol) sub("[ \t]+$", "", symbol) - add_symbol("ap_hook_" symbol) - add_symbol("ap_hook_get_" symbol) - add_symbol("ap_run_" symbol) + add_symbol(prefix "_hook_" symbol) + add_symbol(prefix "_hook_get_" symbol) + add_symbol(prefix "_run_" symbol) next } diff --git a/modules/dav/main/dav.imp b/modules/dav/main/dav.imp deleted file mode 100644 index 88b306da4b..0000000000 --- a/modules/dav/main/dav.imp +++ /dev/null @@ -1,64 +0,0 @@ - - (mod_dav) - dav_add_all_liveprop_xmlns, - dav_add_lock, - dav_add_response, - dav_add_vary_header, - dav_auto_checkin, - dav_auto_checkout, - dav_buffer_append, - dav_buffer_init, - dav_buffer_place, - dav_buffer_place_mem, - dav_check_bufsize, - dav_close_propdb, - dav_core_find_liveprop, - dav_core_insert_all_liveprops, - dav_core_register_uris, - dav_do_find_liveprop, - dav_find_child, - dav_get_allprops, - dav_get_binding_hooks, - dav_get_depth, - dav_get_liveprop_info, - dav_get_liveprop_ns_count, - dav_get_liveprop_ns_index, - dav_get_liveprop_supported, - dav_get_lock_hooks, - dav_get_locktoken_list, - dav_get_propdb_hooks, - dav_get_props, - dav_get_resource_state, - dav_get_search_hooks, - dav_get_timeout, - dav_get_vsn_hooks, - dav_hook_find_liveprop, - dav_hook_gather_propsets, - dav_hook_insert_all_liveprops, - dav_lock_get_activelock, - dav_lock_parse_lockinfo, - dav_lock_query, - dav_lookup_provider, - dav_lookup_uri, - dav_new_error, - dav_new_error_tag, - dav_notify_created, - dav_open_propdb, - dav_prop_commit, - dav_prop_exec, - dav_prop_rollback, - dav_prop_validate, - dav_push_error, - dav_register_liveprop_group, - dav_register_provider, - dav_set_bufsize, - dav_unlock, - dav_validate_request, - dav_validate_root, - dav_xml_get_cdata, - dav_xmlns_add, - dav_xmlns_add_uri, - dav_xmlns_create, - dav_xmlns_generate, - dav_xmlns_get_prefix, - dav_xmlns_get_uri |