You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bn...@apache.org on 2002/01/08 22:39:42 UTC
cvs commit: apr/build nw_export.inc prebuildNW.bat make_nw_export.awk
bnicholes 02/01/08 13:39:42
Modified: build prebuildNW.bat make_nw_export.awk
Added: build nw_export.inc
Log:
Fixed the export list generation for NetWare to make sure that only real APIs
are being exported
Revision Changes Path
1.6 +21 -2 apr/build/prebuildNW.bat
Index: prebuildNW.bat
===================================================================
RCS file: /home/cvs/apr/build/prebuildNW.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- prebuildNW.bat 30 Nov 2001 19:04:55 -0000 1.5
+++ prebuildNW.bat 8 Jan 2002 21:39:42 -0000 1.6
@@ -1,4 +1,19 @@
@echo off
+
+if not "%NovellNDK%" == "" goto CheckNDK
+set NovellNDK=\novell\ndk\libc
+@echo Could not find the NovellNDK environment variable
+@echo Setting NovellNDK = %NovellNDK%
+@echo ---------------------
+
+:CheckNDK
+if exist %NovellNDK%\include\netware.h goto NDKOK
+@echo The path to the NDK "%NovellNDK%" is invalid.
+@echo Please set then NovellNDK environment variable to the location of the NDK
+@echo ---------------------
+goto Done
+
+:NDKOK
@echo # As part of the pre-build process, the utility GenURI.NLM
@echo # (Gen URI Delims) must be built, copied to a NetWare server
@echo # and run using the following command:
@@ -23,5 +38,9 @@
copy ..\..\pcre\pcre.hw ..\..\pcre\pcre.h
@echo Generating the import list...
-awk -f make_nw_export.awk ..\include\*.h |sort > ..\aprlib.imp
-awk -f make_nw_export.awk ..\..\apr-util\include\*.h |sort >> ..\aprlib.imp
+set MWCIncludes=..\include;..\include\arch\netware;..\include\arch\unix;..\..\apr-util\include;+%NovellNDK%
+mwccnlm -P nw_export.inc -d NETWARE -EP
+awk -f make_nw_export.awk nw_export.i |sort >..\aprlib.imp
+
+:Done
+pause
1.7 +3 -59 apr/build/make_nw_export.awk
Index: make_nw_export.awk
===================================================================
RCS file: /home/cvs/apr/build/make_nw_export.awk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- make_nw_export.awk 19 Dec 2001 16:23:43 -0000 1.6
+++ make_nw_export.awk 8 Jan 2002 21:39:42 -0000 1.7
@@ -2,71 +2,15 @@
# based on Ryan Bloom's make_export.pl
# List of functions that we don't support, yet??
-/apr_##name##_set_inherit/{next}
-/apr_##name##_unset_inherit/{next}
-/apr_compare_groups/{next}
-/apr_compare_users/{next}
-/apr_find_pool/{next}
-/apr_generate_random_bytes/{next}
-/apr_lock_create_np/{next}
-/apr_md5_set_xlate/{next}
-/apr_mmap_create/{next}
-/apr_mmap_delete/{next}
-/apr_mmap_dup/{next}
-/apr_mmap_offset/{next}
-/apr_pool_create\(/{next}
-/apr_pool_free_blocks_num_bytes/{next}
-/apr_pool_join/{next}
-/apr_pool_lock/{next}
-/apr_pool_num_bytes/{next}
-/apr_pool_sub_make/{next}
-/apr_proc_mutex_child_init/{next}
-/apr_proc_mutex_create/{next}
-/apr_proc_mutex_create_np/{next}
-/apr_proc_mutex_destroy/{next}
-/apr_proc_mutex_lock/{next}
-/apr_proc_mutex_trylock/{next}
-/apr_proc_mutex_unlock/{next}
-/apr_proc_other_child_check/{next}
-/apr_proc_other_child_read/{next}
-/apr_proc_other_child_register/{next}
-/apr_proc_other_child_unregister/{next}
-/apr_sendfile/{next}
-/apr_shm_avail/{next}
-/apr_shm_calloc/{next}
-/apr_shm_destroy/{next}
-/apr_shm_free/{next}
-/apr_shm_init/{next}
-/apr_shm_malloc/{next}
-/apr_shm_name_get/{next}
-/apr_shm_name_set/{next}
-/apr_shm_open/{next}
-/apr_signal/{next}
-/apr_signal_thread/{next}
-/apr_socket_from_file/{next}
-/apr_xlate_close/{next}
-/apr_xlate_conv_buffer/{next}
-/apr_xlate_conv_byte/{next}
-/apr_xlate_conv_char/{next}
-/apr_xlate_get_sb/{next}
-/apr_xlate_open/{next}
-/apr_brigade_consume/{next}
-/apr_bucket_mmap_create/{next}
-/apr_bucket_mmap_make/{next}
-/apr_bucket_type_mmap/{next}
-/apr_md4_set_xlate/{next}
-/apr_os_proc_mutex_get/{next}
-/apr_os_proc_mutex_put/{next}
-/proc_mutex/{next}
+#/apr_##name##_set_inherit/{next}
+#/apr_##name##_unset_inherit/{next}
function add_symbol (sym_name) {
if (count) {
found++
}
-# for (i = 0; i < count; i++) {
-# line = line "\t"
-# }
+ gsub (/ /, "", sym_name)
line = line sym_name ",\n"
if (count == 0) {
1.1 apr/build/nw_export.inc
Index: nw_export.inc
===================================================================
/* Must include apr.h first so that we can undefine
the standard prototypes macros after it messes with
them. */
#include "apr.h"
#undef APR_DECLARE
#undef APR_DECLARE_NONSTD
#undef APR_DECLARE_HOOK
#undef APR_POOL_DECLARE_ACCESSOR
#undef APR_DECLARE_DATA
/* Preprocess all of the standard APR headers. */
#include "apr_compat.h"
#include "apr_dso.h"
#include "apr_errno.h"
#include "apr_file_info.h"
#include "apr_fnmatch.h"
#include "apr_general.h"
#include "apr_getopt.h"
#include "apr_hash.h"
#include "apr_inherit.h"
#include "apr_lib.h"
#include "apr_lock.h"
#include "apr_md5.h"
#include "apr_mmap.h"
#include "apr_network_io.h"
#include "apr_pools.h"
#include "apr_portable.h"
#include "apr_proc_mutex.h"
#include "apr_ring.h"
/*#include "apr_shmem.h"*/
#include "apr_signal.h"
#include "apr_strings.h"
#include "apr_tables.h"
#include "apr_thread_cond.h"
#include "apr_thread_mutex.h"
#include "apr_thread_proc.h"
#include "apr_thread_rwlock.h"
#include "apr_time.h"
#include "apr_user.h"
#include "apr_uuid.h"
#include "apr_version.h"
#include "apr_want.h"
#include "apr_xlate.h"
/* Must include apu.h first so that we can undefine
the standard prototypes macros after it messes with
them. */
#include "apu.h"
#undef APU_DECLARE
#undef APU_DECLARE_NONSTD
#undef APU_DECLARE_DATA
/* Preprocess all of the standard APR headers. */
#include "apr_base64.h"
#include "apr_buckets.h"
#include "apr_date.h"
#include "apr_dbm.h"
#include "apr_hooks.h"
#include "apr_md4.h"
#include "apr_optional.h"
#include "apr_optional_hooks.h"
#include "apr_sdbm.h"
#include "apr_sha1.h"
#include "apr_uri.h"
#include "apr_xml.h"
#include "apr_compat.h"