]> granicus.if.org Git - php/commitdiff
NetWare can make use of the Autoconf based build system
authorAnantha Kesari H Y <hyanantha@php.net>
Sat, 16 Jul 2005 12:55:45 +0000 (12:55 +0000)
committerAnantha Kesari H Y <hyanantha@php.net>
Sat, 16 Jul 2005 12:55:45 +0000 (12:55 +0000)
23 files changed:
netware/ApacheCore.imp [deleted file]
netware/BisonExtStandard.bat [deleted file]
netware/BisonFlexZend.bat [deleted file]
netware/ZendEngine2.mak [deleted file]
netware/build.bat [deleted file]
netware/buildext.bat [deleted file]
netware/buildlib.bat [deleted file]
netware/buildsapi.bat [deleted file]
netware/common.mif [deleted file]
netware/libpq-fe.h [deleted file]
netware/libpq.imp [deleted file]
netware/php-nw.bat [deleted file]
netware/php5apache.mak [deleted file]
netware/php5apache2filter.mak [deleted file]
netware/php5cli.mak [deleted file]
netware/phplib.imp [deleted file]
netware/phplib.mak [deleted file]
netware/phptest.ncf [deleted file]
netware/postgres_ext.h [deleted file]
netware/setbuild.bat [deleted file]
netware/time_nw.c [deleted file]
netware/tsrm.mak [deleted file]
netware/zend.mak [deleted file]

diff --git a/netware/ApacheCore.imp b/netware/ApacheCore.imp
deleted file mode 100644 (file)
index 3f77837..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
- ap_MD5Final,\r
- ap_MD5Init,\r
- ap_MD5Update,\r
- ap_acquire_mutex,\r
- ap_add_cgi_vars,\r
- ap_add_common_vars,\r
- ap_add_loaded_module,\r
- ap_add_module,\r
- ap_add_named_module,\r
- ap_add_per_dir_conf,\r
- ap_add_per_url_conf,\r
- ap_add_version_component,\r
- ap_allow_options,\r
- ap_allow_overrides,\r
- ap_append_arrays,\r
- ap_array_cat,\r
- ap_auth_name,\r
- ap_auth_type,\r
- ap_basic_http_header,\r
- ap_bclose,\r
- ap_bcreate,\r
- ap_bfilbuf,\r
- ap_bfileno,\r
- ap_bflsbuf,\r
- ap_bflush,\r
- ap_bgetopt,\r
- ap_bgets,\r
- ap_bhalfduplex,\r
- ap_block_alarms,\r
- ap_blookc,\r
- ap_bnonblock,\r
- ap_bonerror,\r
- ap_bpushfd,\r
- ap_bputs,\r
- ap_bread,\r
- ap_bsetflag,\r
- ap_bsetopt,\r
- ap_bskiplf,\r
- ap_bspawn_child,\r
- ap_bwrite,\r
- ap_bytes_in_free_blocks,\r
- ap_bytes_in_pool,\r
- ap_call_exec,\r
- ap_can_exec,\r
- ap_cfg_closefile,\r
- ap_cfg_getc,\r
- ap_cfg_getline,\r
- ap_chdir_file,\r
- ap_check_alarm,\r
- ap_check_cmd_context,\r
- ap_checkmask,\r
- ap_cleanup_for_exec,\r
- ap_clear_module_list,\r
- ap_clear_pool,\r
- ap_clear_table,\r
- ap_close_piped_log,\r
- ap_construct_server,\r
- ap_construct_url,\r
- ap_content_type_tolower,\r
- ap_copy_array,\r
- ap_copy_array_hdr,\r
- ap_copy_table,\r
- ap_count_dirs,\r
- ap_cpystrn,\r
- ap_create_environment,\r
- ap_create_mutex,\r
- ap_create_per_dir_config,\r
- ap_custom_response,\r
- ap_default_port_for_request,\r
- ap_default_port_for_scheme,\r
- ap_default_type,\r
- ap_destroy_mutex,\r
- ap_destroy_pool,\r
- ap_destroy_sub_req,\r
- ap_die,\r
- ap_discard_request_body,\r
- ap_document_root,\r
- ap_each_byterange,\r
- ap_error_log2stderr,\r
- ap_escape_html,\r
- ap_escape_path_segment,\r
- ap_escape_quotes,\r
- ap_escape_shell_cmd,\r
- ap_exists_scoreboard_image,\r
- ap_finalize_request_protocol,\r
- ap_find_command,\r
- ap_find_command_in_modules,\r
- ap_find_last_token,\r
- ap_find_linked_module,\r
- ap_find_module_name,\r
- ap_find_path_info,\r
- ap_find_token,\r
- ap_get_basic_auth_pw,\r
- ap_get_client_block,\r
- ap_get_gmtoff,\r
- ap_get_limit_req_body,\r
- ap_get_remote_host,\r
- ap_get_remote_logname,\r
- ap_get_server_built,\r
- ap_get_server_name,\r
- ap_get_server_port,\r
- ap_get_server_version,\r
- ap_get_time,\r
- ap_get_token,\r
- ap_getparents,\r
- ap_getword,\r
- ap_getword_conf,\r
- ap_getword_conf_nc,\r
- ap_getword_nc,\r
- ap_getword_nulls,\r
- ap_getword_nulls_nc,\r
- ap_getword_white,\r
- ap_getword_white_nc,\r
- ap_gm_timestr_822,\r
- ap_gname2id,\r
- ap_handle_command,\r
- ap_hard_timeout,\r
- ap_ht_time,\r
- ap_ind,\r
- ap_index_of_response,\r
- ap_init_virtual_host,\r
- ap_internal_redirect,\r
- ap_internal_redirect_handler,\r
- ap_is_directory,\r
- ap_is_fnmatch,\r
- ap_is_initial_req,\r
- ap_is_matchexp,\r
- ap_is_url,\r
- ap_kill_cleanup,\r
- ap_kill_cleanups_for_fd,\r
- ap_kill_cleanups_for_socket,\r
- ap_kill_timeout,\r
- ap_log_assert,\r
- ap_log_error_old,\r
- ap_log_reason,\r
- ap_log_unixerr,\r
- ap_make_array,\r
- ap_make_dirstr,\r
- ap_make_dirstr_parent,\r
- ap_make_dirstr_prefix,\r
- ap_make_full_path,\r
- ap_make_sub_pool,\r
- ap_make_table,\r
- ap_matches_request_vhost,\r
- ap_md5,\r
- ap_md5_binary,\r
- ap_md5contextTo64,\r
- ap_md5digest,\r
- ap_meets_conditions,\r
- ap_no2slash,\r
- ap_note_auth_failure,\r
- ap_note_basic_auth_failure,\r
- ap_note_cleanups_for_fd,\r
- ap_note_cleanups_for_file,\r
- ap_note_cleanups_for_socket,\r
- ap_note_digest_auth_failure,\r
- ap_note_subprocess,\r
- ap_open_mutex,\r
- ap_open_piped_log,\r
- ap_os_escape_path,\r
- ap_overlap_tables,\r
- ap_overlay_tables,\r
- ap_palloc,\r
- ap_parseHTTPdate,\r
- ap_parse_hostinfo_components,\r
- ap_parse_uri,\r
- ap_parse_uri_components,\r
- ap_pcalloc,\r
- ap_pcfg_open_custom,\r
- ap_pcfg_openfile,\r
- ap_pclosedir,\r
- ap_pclosef,\r
- ap_pclosesocket,\r
- ap_pduphostent,\r
- ap_pfclose,\r
- ap_pfdopen,\r
- ap_pfopen,\r
- ap_pgethostbyname,\r
- ap_popendir,\r
- ap_popenf,\r
- ap_pregcomp,\r
- ap_pregfree,\r
- ap_pregsub,\r
- ap_psignature,\r
- ap_psocket,\r
- ap_pstrdup,\r
- ap_pstrndup,\r
- ap_push_array,\r
- ap_pvsprintf,\r
- ap_rationalize_mtime,\r
- ap_register_cleanup,\r
- ap_release_mutex,\r
- ap_remove_loaded_module,\r
- ap_remove_module,\r
- ap_requires,\r
- ap_reset_timeout,\r
- ap_rflush,\r
- ap_rind,\r
- ap_rputc,\r
- ap_rputs,\r
- ap_run_cleanup,\r
- ap_run_sub_req,\r
- ap_rwrite,\r
- ap_satisfies,\r
- ap_scan_script_header_err,\r
- ap_scan_script_header_err_buff,\r
- ap_scan_script_header_err_core,\r
- ap_send_fb,\r
- ap_send_fb_length,\r
- ap_send_fd,\r
- ap_send_fd_length,\r
- ap_send_http_header,\r
- ap_send_http_trace,\r
- ap_send_mmap,\r
- ap_send_size,\r
- ap_server_root_relative,\r
- ap_set_byterange,\r
- ap_set_content_length,\r
- ap_set_etag,\r
- ap_set_keepalive,\r
- ap_set_last_modified,\r
- ap_setup_client_block,\r
- ap_should_client_block,\r
- ap_soft_timeout,\r
- ap_some_auth_required,\r
- ap_spawn_child,\r
- ap_srm_command_loop,\r
- ap_str_tolower,\r
- ap_strcasecmp_match,\r
- ap_strcmp_match,\r
- ap_sub_req_lookup_file,\r
- ap_sub_req_lookup_uri,\r
- ap_sync_scoreboard_image,\r
- ap_table_add,\r
- ap_table_addn,\r
- ap_table_get,\r
- ap_table_merge,\r
- ap_table_mergen,\r
- ap_table_set,\r
- ap_table_setn,\r
- ap_table_unset,\r
- ap_tm2sec,\r
- ap_uname2id,\r
- ap_unblock_alarms,\r
- ap_unescape_url,\r
- ap_unparse_uri_components,\r
- ap_update_mtime,\r
- ap_uudecode,\r
- ap_uuencode,\r
- ap_vbprintf,\r
- ap_vformatter,\r
- ap_vsnprintf,\r
- regcomp,\r
- regexec,\r
- regfree,\r
- access_module,\r
- alias_module,\r
- ap_bprintf,\r
- ap_bvputs,\r
- ap_day_snames,\r
- ap_extended_status,\r
- ap_limit_section,\r
- ap_loaded_modules,\r
- ap_log_error,\r
- ap_log_printf,\r
- ap_log_rerror,\r
- ap_month_snames,\r
- ap_null_cleanup,\r
- ap_psprintf,\r
- ap_pstrcat,\r
- ap_restart_time,\r
- ap_rprintf,\r
- ap_rvputs,\r
- ap_scoreboard_image,\r
- ap_send_header_field,\r
- ap_server_argv0,\r
- ap_server_root,\r
- ap_set_file_slot,\r
- ap_set_flag_slot,\r
- ap_set_string_slot,\r
- ap_set_string_slot_lower,\r
- ap_snprintf,\r
- ap_suexec_enabled,\r
- ap_table_do,\r
- apache_main,\r
- asis_module,\r
- auth_module,\r
- autoindex_module,\r
- config_log_module,\r
- core_module,\r
- dir_module,\r
- env_module,\r
- imap_module,\r
- includes_module,\r
- mime_module,\r
- negotiation_module,\r
- setenvif_module,\r
- so_module,\r
- top_module,\r
- ap_fnmatch,\r
- ap_method_number_of,\r
- ap_exists_config_define,\r
- ap_single_module_configure,\r
- ap_make_etag,\r
- ap_array_pstrcat,\r
- ap_find_list_item,\r
- ap_MD5Encode,\r
- ap_validate_password,\r
- ap_size_list_item,\r
- ap_get_list_item,\r
- ap_scoreboard_fname,\r
- ap_pid_fname,\r
- ap_excess_requests_per_child,\r
- ap_threads_per_child,\r
- ap_max_requests_per_child,\r
- ap_daemons_to_start,\r
- ap_daemons_min_free,\r
- ap_daemons_max_free,\r
- ap_daemons_limit,\r
- ap_user_name,\r
- ap_user_id,\r
- ap_group_id,\r
- ap_standalone,\r
- ap_server_confname,\r
- ap_sub_req_method_uri,\r
- ap_regerror,\r
- ap_regexec,\r
- ap_field_noparam,\r
- ap_pbase64decode,\r
- ap_pbase64encode,\r
- ap_base64encode,\r
- ap_base64encode_binary,\r
- ap_base64encode_len,\r
- ap_base64decode,\r
- ap_base64decode_binary,\r
- ap_base64decode_len,\r
- ap_SHA1Init,\r
- ap_SHA1Update_binary,\r
- ap_SHA1Update,\r
- ap_SHA1Final,\r
- ap_sha1_base64,\r
- ap_my_generation,\r
- ap_get_virthost_addr,\r
- ap_listeners,\r
- ap_listenbacklog,\r
- clean_parent_exit,\r
- init_tsd,\r
- ap_set_config_vectors,\r
- ap_strcasestr,\r
- ap_to64,\r
- ap_vrprintf,\r
- regerror,\r
- ap_add_file_conf,\r
- ap_configtestonly,\r
- ap_is_rdirectory,\r
- ap_remove_spaces,\r
- ap_scan_script_header_err_strs,\r
- ap_start_shutdown,\r
- ap_start_restart,\r
- ap_stripprefix,\r
- ap_send_error_response,\r
- ap_os_canonical_filename,\r
- ap_os_http_method,\r
- os_readdir,\r
- os_opendir\r
diff --git a/netware/BisonExtStandard.bat b/netware/BisonExtStandard.bat
deleted file mode 100755 (executable)
index 4b394d8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off\r
-\r
diff --git a/netware/BisonFlexZend.bat b/netware/BisonFlexZend.bat
deleted file mode 100755 (executable)
index 5ed6aa3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off\r
-\r
-bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y\r
-flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l\r
-REM flex -i -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l\r
-bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y\r
-flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l\r
-REM flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l\r
diff --git a/netware/ZendEngine2.mak b/netware/ZendEngine2.mak
deleted file mode 100644 (file)
index effd309..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# Temporarily here -- later may go into some batch file 
-# which will set this as an environment variable
-PROJECT_ROOT = ..
-
-# Module details
-MODULE_NAME = ZEND
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-C_SRC = zend.c \
-        zend_alloc.c \
-        zend_API.c \
-        zend_builtin_functions.c \
-        zend_compile.c \
-        zend_constants.c \
-        zend_dynamic_array.c \
-        zend_execute.c \
-        zend_execute_API.c \
-        zend_extensions.c \
-        zend_hash.c \
-        zend_highlight.c \
-        zend_indent.c \
-        zend_ini.c \
-        zend_ini_parser.c \
-        zend_ini_scanner.c \
-        zend_language_parser.c \
-        zend_language_scanner.c \
-        zend_list.c \
-        zend_llist.c \
-        zend_multibyte.c \
-        zend_object_handlers.c \
-        zend_objects.c \
-        zend_opcode.c \
-        zend_operators.c \
-        zend_ptr_stack.c \
-        zend_qsort.c \
-        zend_sprintf.c \
-        zend_stack.c \
-        zend_static_allocator.c \
-        zend_ts_hash.c \
-        zend_variables.c
-
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-       BINARY=$(FINAL_DIR)\$(MODULE_NAME).lib
-endif
-
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle std
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED
-C_FLAGS += -DNETWARE -DZTS
-C_FLAGS  += -DNEW_LIBC
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DTHREAD_SWITCH
-
-# These are required to use dlclose so that the PHP extensions are automatically unloaded
-# when apache is unloaded
-C_FLAGS  += -DHAVE_DLFCN_H -DHAVE_LIBDL
-
-C_FLAGS += -I. -I- -I../netware -I$(SDK_DIR)/include   # ../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-
-
-# Link flags
-LD_FLAGS  = -type library
-LD_FLAGS += -o $(BINARY)
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       C_FLAGS  += -DZEND_DEBUG=1
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics
-       LD_FLAGS += -sym codeview4 -sym internal
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-       C_FLAGS  += -opt speed -inline on -inline auto -sym off
-       C_FLAGS  += -DZEND_DEBUG=0
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-       
-$(OBJ_DIR)/%.obj: %.c
-       @echo Compiling $?...
-       @$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-       @echo Linking $@...
-       @$(LINK) $(LD_FLAGS) $(OBJECTS)
-
-
-.PHONY: clean
-clean: cleansrc cleanobj cleanbin
-
-.PHONY: cleansrc
-cleansrc:
-       @echo Deleting all generated source files...
-       -@del "zend_ini_parser.c"
-       -@del "zend_ini_parser.h"
-       -@del "zend_ini_scanner.c"
-       -@del "zend_language_parser.c"
-       -@del "zend_language_parser.h"
-       -@del "zend_language_scanner.c"
-       -@del "zend_ini_parser.output"
-       -@del "zend_language_parser.output"
-
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).lib"
diff --git a/netware/build.bat b/netware/build.bat
deleted file mode 100755 (executable)
index 5c8e310..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-cd ..\%1
-
-if "%2" == "clean" make -f ..\netware\%1.mak clean
-if "%2" == "/?" goto USAGE
-
-if "%1" == "zend" call ..\netware\BisonFlexZend
-if "%1" == "ZendEngine2" call ..\netware\BisonFlexZend
-
-REM Build command
-make -f ..\netware\%1.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: build moduleName [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd ..\netware
\ No newline at end of file
diff --git a/netware/buildext.bat b/netware/buildext.bat
deleted file mode 100755 (executable)
index 6cea553..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-
-cd ..\ext\%1
-
-if "%2" == "clean" make -f %1.mak clean
-if "%2" == "/?" goto USAGE
-
-REM Build command
-make -f %1.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: buildext extension_name [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd ..\..\netware
diff --git a/netware/buildlib.bat b/netware/buildlib.bat
deleted file mode 100755 (executable)
index 5abd712..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-cd ..
-
-if "%1" == "clean" make -f netware\phplib.mak clean
-if "%1" == "/?" goto USAGE
-
-call netware\BisonExtStandard
-
-REM Build command
-make -f netware\phplib.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: buildlib [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd netware
\ No newline at end of file
diff --git a/netware/buildsapi.bat b/netware/buildsapi.bat
deleted file mode 100755 (executable)
index ddf299a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-
-cd ..\sapi\%1
-
-if "%2" == "clean" make -f ..\..\netware\php5%1.mak clean
-if "%2" == "/?" goto USAGE
-
-REM Build command
-make -f ..\..\netware\php5%1.mak
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: buildsapi SAPI_Module_Name [clean]
- @echo clean - delete all object files and binaries before building
-
-:EXIT
-cd ..\..\netware
diff --git a/netware/common.mif b/netware/common.mif
deleted file mode 100644 (file)
index a2250e3..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Common include file for PHP build.
-# Include this in every make file.
-#
-
-
-# Set following directories based on your setting
-
-# Path to CodeWarrior installation
-CW_PATH = P:/APPS/SCRIPT/SW/CW71-4
-
-# LibC directory
-ifndef SDK_DIR
-SDK_DIR = P:/APPS/script/sw/libc
-endif
-
-# MPK related directory
-ifndef MPK_DIR
-MPK_DIR = p:/apps/script/mpk
-XDCTOOL = mpkxdc
-MPKTOOL = $(MPK_DIR)/$(XDCTOOL)
-XDCFLAGS = -n
-endif
-
-# Winsock stuff
-WINSOCK_DIR = P:/APPS/script/sw/Winsock2
-
-# LDAP stuff
-LDAP_DIR = P:/APPS/script/sw/cldapsdk
-
-# XML-EXPAT stuff
-EXPAT_DIR = P:/APPS/script/sw/expat
-
-
-# Web Server defaults to Apache 1.3.x
-ifndef APACHE_VER
-APACHE_VER = 1.3
-endif
-
-# Apache directory
-ifeq '$(APACHE_VER)' '1.3'
-APACHE_DIR = P:/APPS/script/sw/Apache1.3.xSource
-else
-APACHE_DIR = P:/APPS/script/sw/Apache2Source
-endif
-
-
-# CW includes, libraries and tools
-export MWCIncludes=$(CW_PATH)/include
-export MWLibraries=$(CW_PATH)/lib
-
-# Compiler and linker tools
-CC = mwccnlm
-LINK = mwldnlm
-
-# Build type defaults to 'release'
-ifndef BUILD
-BUILD = release
-endif
-
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-
-ifndef STACK_SIZE
-STACK_SIZE=65536
-endif
-
-ifndef COPYRIGHT
-COPYRIGHT = "Copyright (C) 2002-2003  Novell\, Inc. All Rights Reserved."
-endif
-
-
-# Compile flags
-ifeq '$(APACHE_VER)' '1.3'
-C_FLAGS  = -align 1
-C_FLAGS += -DCLIB_STAT_PATCH
-else
-C_FLAGS  = -align 4
-endif
-
-# Link flags
-LD_FLAGS  = -stacksize $(STACK_SIZE) -type generic -zerobss
-LD_FLAGS += -o $(BINARY) -map $(MAP_FILE) -nlmversion $(VMAJ),$(VMIN),$(VREV)
-
-# Module details
-LD_FLAGS += -desc $(MODULE_DESC)
-LD_FLAGS += -copy $(COPYRIGHT)
-LD_FLAGS += -screenname Default
-LD_FLAGS += -threadname $(MODULE_NAME)__p
diff --git a/netware/libpq-fe.h b/netware/libpq-fe.h
deleted file mode 100644 (file)
index 879a447..0000000
+++ /dev/null
@@ -1,378 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * libpq-fe.h
- *       This file contains definitions for structures and
- *       externs for functions used by frontend postgres applications.
- *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Id$
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef LIBPQ_FE_H
-#define LIBPQ_FE_H
-
-#ifdef __cplusplus
-extern         "C"
-{
-#endif
-
-#include <stdio.h>
-
-/*
- * postgres_ext.h defines the backend's externally visible types,
- * such as Oid.
- */
-#include "postgres_ext.h"
-
-/* SSL type is needed here only to declare PQgetssl() */
-#ifdef USE_SSL
-#include <openssl/ssl.h>
-#endif
-
-/* Application-visible enum types */
-
-typedef enum
-{
-       /*
-        * Although you may decide to change this list in some way, values
-        * which become unused should never be removed, nor should constants
-        * be redefined - that would break compatibility with existing code.
-        */
-       CONNECTION_OK,
-       CONNECTION_BAD,
-       /* Non-blocking mode only below here */
-
-       /*
-        * The existence of these should never be relied upon - they should
-        * only be used for user feedback or similar purposes.
-        */
-       CONNECTION_STARTED,                     /* Waiting for connection to be made.  */
-       CONNECTION_MADE,                        /* Connection OK; waiting to send.         */
-       CONNECTION_AWAITING_RESPONSE,           /* Waiting for a response from the
-                                                                                * postmaster.            */
-       CONNECTION_AUTH_OK,                     /* Received authentication; waiting for
-                                                                * backend startup. */
-       CONNECTION_SETENV                       /* Negotiating environment.    */
-} ConnStatusType;
-
-typedef enum
-{
-       PGRES_POLLING_FAILED = 0,
-       PGRES_POLLING_READING,          /* These two indicate that one may        */
-       PGRES_POLLING_WRITING,          /* use select before polling again.   */
-       PGRES_POLLING_OK,
-       PGRES_POLLING_ACTIVE            /* Can call poll function immediately. */
-} PostgresPollingStatusType;
-
-typedef enum
-{
-       PGRES_EMPTY_QUERY = 0,
-       PGRES_COMMAND_OK,                       /* a query command that doesn't return
-                                                                * anything was executed properly by the
-                                                                * backend */
-       PGRES_TUPLES_OK,                        /* a query command that returns tuples was
-                                                                * executed properly by the backend,
-                                                                * PGresult contains the result tuples */
-       PGRES_COPY_OUT,                         /* Copy Out data transfer in progress */
-       PGRES_COPY_IN,                          /* Copy In data transfer in progress */
-       PGRES_BAD_RESPONSE,                     /* an unexpected response was recv'd from
-                                                                * the backend */
-       PGRES_NONFATAL_ERROR,
-       PGRES_FATAL_ERROR
-} ExecStatusType;
-
-/* PGconn encapsulates a connection to the backend.
- * The contents of this struct are not supposed to be known to applications.
- */
-typedef struct pg_conn PGconn;
-
-/* PGresult encapsulates the result of a query (or more precisely, of a single
- * SQL command --- a query string given to PQsendQuery can contain multiple
- * commands and thus return multiple PGresult objects).
- * The contents of this struct are not supposed to be known to applications.
- */
-typedef struct pg_result PGresult;
-
-/* PGnotify represents the occurrence of a NOTIFY message.
- * Ideally this would be an opaque typedef, but it's so simple that it's
- * unlikely to change.
- * NOTE: in Postgres 6.4 and later, the be_pid is the notifying backend's,
- * whereas in earlier versions it was always your own backend's PID.
- */
-typedef struct pgNotify
-{
-       char            relname[NAMEDATALEN];   /* name of relation containing
-                                                                                * data */
-       int                     be_pid;                 /* process id of backend */
-} PGnotify;
-
-/* PQnoticeProcessor is the function type for the notice-message callback.
- */
-typedef void (*PQnoticeProcessor) (void *arg, const char *message);
-
-/* Print options for PQprint() */
-typedef char pqbool;
-
-typedef struct _PQprintOpt
-{
-       pqbool          header;                 /* print output field headings and row
-                                                                * count */
-       pqbool          align;                  /* fill align the fields */
-       pqbool          standard;               /* old brain dead format */
-       pqbool          html3;                  /* output html tables */
-       pqbool          expanded;               /* expand tables */
-       pqbool          pager;                  /* use pager for output if needed */
-       char       *fieldSep;           /* field separator */
-       char       *tableOpt;           /* insert to HTML <table ...> */
-       char       *caption;            /* HTML <caption> */
-       char      **fieldName;          /* null terminated array of repalcement
-                                                                * field names */
-} PQprintOpt;
-
-/* ----------------
- * Structure for the conninfo parameter definitions returned by PQconndefaults
- *
- * All fields except "val" point at static strings which must not be altered.
- * "val" is either NULL or a malloc'd current-value string.  PQconninfoFree()
- * will release both the val strings and the PQconninfoOption array itself.
- * ----------------
- */
-typedef struct _PQconninfoOption
-{
-       char       *keyword;            /* The keyword of the option                    */
-       char       *envvar;                     /* Fallback environment variable name   */
-       char       *compiled;           /* Fallback compiled in default value   */
-       char       *val;                        /* Option's current value, or NULL               */
-       char       *label;                      /* Label for field in connect dialog    */
-       char       *dispchar;           /* Character to display for this field in
-                                                                * a connect dialog. Values are: ""
-                                                                * Display entered value as is "*"
-                                                                * Password field - hide value "D"      Debug
-                                                                * option - don't show by default */
-       int                     dispsize;               /* Field size in characters for dialog  */
-} PQconninfoOption;
-
-/* ----------------
- * PQArgBlock -- structure for PQfn() arguments
- * ----------------
- */
-typedef struct
-{
-       int                     len;
-       int                     isint;
-       union
-       {
-               int                *ptr;                /* can't use void (dec compiler barfs)   */
-               int                     integer;
-       }                       u;
-} PQArgBlock;
-
-/* ----------------
- * Exported functions of libpq
- * ----------------
- */
-
-/* === in fe-connect.c === */
-
-/* make a new client connection to the backend */
-/* Asynchronous (non-blocking) */
-extern PGconn *PQconnectStart(const char *conninfo);
-extern PostgresPollingStatusType PQconnectPoll(PGconn *conn);
-
-/* Synchronous (blocking) */
-extern PGconn *PQconnectdb(const char *conninfo);
-extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport,
-                        const char *pgoptions, const char *pgtty,
-                        const char *dbName,
-                        const char *login, const char *pwd);
-
-#define PQsetdb(M_PGHOST,M_PGPORT,M_PGOPT,M_PGTTY,M_DBNAME)  \
-       PQsetdbLogin(M_PGHOST, M_PGPORT, M_PGOPT, M_PGTTY, M_DBNAME, NULL, NULL)
-
-/* close the current connection and free the PGconn data structure */
-extern void PQfinish(PGconn *conn);
-
-/* get info about connection options known to PQconnectdb */
-extern PQconninfoOption *PQconndefaults(void);
-
-/* free the data structure returned by PQconndefaults() */
-extern void PQconninfoFree(PQconninfoOption *connOptions);
-
-/*
- * close the current connection and restablish a new one with the same
- * parameters
- */
-/* Asynchronous (non-blocking) */
-extern int     PQresetStart(PGconn *conn);
-extern PostgresPollingStatusType PQresetPoll(PGconn *conn);
-
-/* Synchronous (blocking) */
-extern void PQreset(PGconn *conn);
-
-/* issue a cancel request */
-extern int     PQrequestCancel(PGconn *conn);
-
-/* Accessor functions for PGconn objects */
-extern char *PQdb(const PGconn *conn);
-extern char *PQuser(const PGconn *conn);
-extern char *PQpass(const PGconn *conn);
-extern char *PQhost(const PGconn *conn);
-extern char *PQport(const PGconn *conn);
-extern char *PQtty(const PGconn *conn);
-extern char *PQoptions(const PGconn *conn);
-extern ConnStatusType PQstatus(const PGconn *conn);
-extern char *PQerrorMessage(const PGconn *conn);
-extern int     PQsocket(const PGconn *conn);
-extern int     PQbackendPID(const PGconn *conn);
-extern int     PQclientEncoding(const PGconn *conn);
-extern int     PQsetClientEncoding(PGconn *conn, const char *encoding);
-
-#ifdef USE_SSL
-/* Get the SSL structure associated with a connection */
-extern SSL *PQgetssl(PGconn *conn);
-#endif
-
-
-/* Enable/disable tracing */
-extern void PQtrace(PGconn *conn, FILE *debug_port);
-extern void PQuntrace(PGconn *conn);
-
-/* Override default notice processor */
-extern PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn,
-                                        PQnoticeProcessor proc,
-                                        void *arg);
-
-/* === in fe-exec.c === */
-
-/* Quoting strings before inclusion in queries. */
-extern size_t PQescapeString(char *to, const char *from, size_t length);
-extern unsigned char *PQescapeBytea(unsigned char *bintext, size_t binlen,
-                         size_t *bytealen);
-
-/* Simple synchronous query */
-extern PGresult *PQexec(PGconn *conn, const char *query);
-extern PGnotify *PQnotifies(PGconn *conn);
-extern void PQfreeNotify(PGnotify *notify);
-
-/* Interface for multiple-result or asynchronous queries */
-extern int     PQsendQuery(PGconn *conn, const char *query);
-extern PGresult *PQgetResult(PGconn *conn);
-
-/* Routines for managing an asychronous query */
-extern int     PQisBusy(PGconn *conn);
-extern int     PQconsumeInput(PGconn *conn);
-
-/* Routines for copy in/out */
-extern int     PQgetline(PGconn *conn, char *string, int length);
-extern int     PQputline(PGconn *conn, const char *string);
-extern int     PQgetlineAsync(PGconn *conn, char *buffer, int bufsize);
-extern int     PQputnbytes(PGconn *conn, const char *buffer, int nbytes);
-extern int     PQendcopy(PGconn *conn);
-
-/* Set blocking/nonblocking connection to the backend */
-extern int     PQsetnonblocking(PGconn *conn, int arg);
-extern int     PQisnonblocking(const PGconn *conn);
-
-/* Force the write buffer to be written (or at least try) */
-extern int     PQflush(PGconn *conn);
-
-/*
- * "Fast path" interface --- not really recommended for application
- * use
- */
-extern PGresult *PQfn(PGconn *conn,
-        int fnid,
-        int *result_buf,
-        int *result_len,
-        int result_is_int,
-        const PQArgBlock *args,
-        int nargs);
-
-/* Accessor functions for PGresult objects */
-extern ExecStatusType PQresultStatus(const PGresult *res);
-extern char *PQresStatus(ExecStatusType status);
-extern char *PQresultErrorMessage(const PGresult *res);
-extern int     PQntuples(const PGresult *res);
-extern int     PQnfields(const PGresult *res);
-extern int     PQbinaryTuples(const PGresult *res);
-extern char *PQfname(const PGresult *res, int field_num);
-extern int     PQfnumber(const PGresult *res, const char *field_name);
-extern Oid     PQftype(const PGresult *res, int field_num);
-extern int     PQfsize(const PGresult *res, int field_num);
-extern int     PQfmod(const PGresult *res, int field_num);
-extern char *PQcmdStatus(PGresult *res);
-extern char *PQoidStatus(const PGresult *res); /* old and ugly */
-extern Oid     PQoidValue(const PGresult *res);        /* new and improved */
-extern char *PQcmdTuples(PGresult *res);
-extern char *PQgetvalue(const PGresult *res, int tup_num, int field_num);
-extern int     PQgetlength(const PGresult *res, int tup_num, int field_num);
-extern int     PQgetisnull(const PGresult *res, int tup_num, int field_num);
-
-/* Delete a PGresult */
-extern void PQclear(PGresult *res);
-
-/*
- * Make an empty PGresult with given status (some apps find this
- * useful). If conn is not NULL and status indicates an error, the
- * conn's errorMessage is copied.
- */
-extern PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status);
-
-/* === in fe-print.c === */
-
-extern void
-PQprint(FILE *fout,                            /* output stream */
-               const PGresult *res,
-               const PQprintOpt *ps);  /* option structure */
-
-/*
- * really old printing routines
- */
-extern void
-PQdisplayTuples(const PGresult *res,
-                               FILE *fp,               /* where to send the output */
-                               int fillAlign,  /* pad the fields with spaces */
-                               const char *fieldSep,   /* field separator */
-                               int printHeader,        /* display headers? */
-                               int quiet);
-
-extern void
-PQprintTuples(const PGresult *res,
-                         FILE *fout,           /* output stream */
-                         int printAttName, /* print attribute names */
-                         int terseOutput,      /* delimiter bars */
-                         int width);           /* width of column, if 0, use variable
-                                                                * width */
-
-
-/* === in fe-lobj.c === */
-
-/* Large-object access routines */
-extern int     lo_open(PGconn *conn, Oid lobjId, int mode);
-extern int     lo_close(PGconn *conn, int fd);
-extern int     lo_read(PGconn *conn, int fd, char *buf, size_t len);
-extern int     lo_write(PGconn *conn, int fd, char *buf, size_t len);
-extern int     lo_lseek(PGconn *conn, int fd, int offset, int whence);
-extern Oid     lo_creat(PGconn *conn, int mode);
-extern int     lo_tell(PGconn *conn, int fd);
-extern int     lo_unlink(PGconn *conn, Oid lobjId);
-extern Oid     lo_import(PGconn *conn, const char *filename);
-extern int     lo_export(PGconn *conn, Oid lobjId, const char *filename);
-
-/* === in fe-misc.c === */
-
-/* Determine length of multibyte encoded char at *s */
-extern int     PQmblen(const unsigned char *s, int encoding);
-
-/* Get encoding id from environment variable PGCLIENTENCODING */
-extern int     PQenv2encoding(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif   /* LIBPQ_FE_H */
diff --git a/netware/libpq.imp b/netware/libpq.imp
deleted file mode 100644 (file)
index 922679f..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
- lo_open,
- lo_close,
- lo_read,
- lo_write,
- lo_lseek,
- lo_creat,
- lo_tell,
- lo_unlink,
- lo_import,
- lo_export,
- PQconnectdb,
- PQconnectStart,
- PQconndefaults,
- PQsetdbLogin,
- PQconnectPoll,
- PQfinish,
- PQreset,
- PQresetStart,
- PQresetPoll,
- PQrequestCancel,
- PQconninfoFree,
- PQdb,
- PQuser,
- PQpass,
- PQhost,
- PQport,
- PQtty,
- PQoptions,
- PQstatus,
- PQerrorMessage,
- PQsocket,
- PQbackendPID,
- PQclientEncoding,
- PQsetClientEncoding,
- PQtrace,
- PQuntrace,
- PQsetNoticeProcessor,
- PQmakeEmptyPGresult,
- PQclear,
- PQsendQuery,
- PQconsumeInput,
- PQisBusy,
- PQgetResult,
- PQexec,
- PQnotifies,
- PQgetline,
- PQgetlineAsync,
- PQputline,
- PQputnbytes,
- PQendcopy,
- PQfn,
- PQresultStatus,
- PQresStatus,
- PQresultErrorMessage,
- PQntuples,
- PQnfields,
- PQbinaryTuples,
- PQfname,
- PQfnumber,
- PQftype,
- PQfsize,
- PQfmod,
- PQcmdStatus,
- PQoidStatus,
- PQoidValue,
- PQcmdTuples,
- PQgetvalue,
- PQgetlength,
- PQgetisnull,
- PQsetnonblocking,
- PQisnonblocking,
- PQflush,
- PQmblen,
- PQenv2encoding,
- PQprint,
- PQdisplayTuples,
- PQprintTuples,
- pg_valid_client_encoding,
- pg_valid_server_encoding,
- pg_char_to_encname_struct,
- pg_char_to_encoding,
- pg_encoding_to_char,
- createPQExpBuffer,
- initPQExpBuffer,
- destroyPQExpBuffer,
- termPQExpBuffer,
- resetPQExpBuffer,
- enlargePQExpBuffer,
- printfPQExpBuffer,
- appendPQExpBuffer,
- appendPQExpBufferStr,
- appendPQExpBufferChar,
- appendBinaryPQExpBuffer
diff --git a/netware/php-nw.bat b/netware/php-nw.bat
deleted file mode 100755 (executable)
index 3d2b59d..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-
-REM CodeWarrior stuff
-set path=%path%;P:\APPS\SCRIPT\SW\CW71-4\BIN
-
-REM Tools for building Zend
-set path=%path%;P:\APPS\SCRIPT\SW\GNUWIN32\BIN
-
-REM Build options
-setbuild r 1
diff --git a/netware/php5apache.mak b/netware/php5apache.mak
deleted file mode 100644 (file)
index d7d9342..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ../..
-
-# Module details
-MODULE_NAME = mod_php
-MODULE_DESC = "PHP 5 - Apache 1.3 Module"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = mod_php5.c \
-        php_apache.c \
-        sapi_apache.c \
-        libpre.c
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -w nounusedarg -msext on
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS += -DNETWARE
-C_FLAGS += -DZTS
-C_FLAGS += -DNLM_PLATFORM
-C_FLAGS += -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED -DAPACHE_OS_H -DNO_USE_SIGACTION -DMULTITHREAD
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -I. -I- -I. -I../../netware -I$(SDK_DIR)/include            # ../../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-C_FLAGS += -I$(APACHE_DIR)/include -I$(APACHE_DIR)/os/netware
-C_FLAGS += -I- -I../../main -I../../Zend -I../../TSRM -I../../ext/standard
-C_FLAGS += -I../../ -I../../netware -I$(PROJECT_ROOT)/regex
-C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-       C_FLAGS += -r -DZEND_DEBUG=1
-       C_FLAGS += -exc cw
-       LD_FLAGS += -sym on -sym codeview4 -sym internal -osym $(SYM_FILE) 
-        LD_FLAGS += -msgstyle std
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-       C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off -DZEND_DEBUG=0
-       C_FLAGS += -opt intrinsics
-       C_FLAGS += -opt level=4
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp            \
-         @$(PROJECT_ROOT)/netware/apachecore.imp \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = php5_module
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.c
-       @echo Compiling $?...
-       @$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-       @echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-       @echo Import $(API) >> $(basename $@).def
-endif
-       @echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-       @echo Export $(EXPORT) >> $(basename $@).def
-endif
-       @echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-       @echo Debug >> $(basename $@).def
-endif
-       @echo Flag_On 0x00000008 >> $(basename $@).def
-       @echo Start _lib_start >> $(basename $@).def
-       @echo Exit _lib_stop >> $(basename $@).def
-
-       $(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-       @echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-       @echo Linking $@...
-       @echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-       @echo $(LIBRARY) >> $(basename $@).link
-endif
-       @echo $(OBJECTS) >> $(basename $@).link
-
-       @$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-       @echo Deleting MAP, DEF files, etc....
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-       -@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/php5apache2filter.mak b/netware/php5apache2filter.mak
deleted file mode 100644 (file)
index 7cc1a29..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ../..
-
-# Module details
-MODULE_NAME = mod_php
-MODULE_DESC = "PHP 5 - Apache 2.0 Module"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = apache_config.c \
-        php_functions.c \
-        sapi_apache2.c
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -w nounusedarg -msext on
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS += -DNETWARE
-C_FLAGS += -DZTS
-C_FLAGS += -DNLM_PLATFORM
-C_FLAGS += -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED -DAPACHE_OS_H -DNO_USE_SIGACTION -DMULTITHREAD
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -I. -I- -I. -I../../netware -I$(SDK_DIR)/include            # ../../netware added for special SYS/STAT.H
-C_FLAGS += -I$(SDK_DIR)/include/winsock        # For Apache 2.0 headers
-C_FLAGS += -I$(MWCIncludes)
-C_FLAGS += -I$(APACHE_DIR)/include
-C_FLAGS += -I- -I../../main -I../../Zend -I../../TSRM -I../../ext/standard
-C_FLAGS += -I../../ -I../../netware -I$(PROJECT_ROOT)/regex
-C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-       C_FLAGS += -r -DZEND_DEBUG=1
-       C_FLAGS += -exc cw
-       LD_FLAGS += -sym on -sym codeview4 -sym internal -osym $(SYM_FILE) 
-        LD_FLAGS += -msgstyle std
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-       C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off -DZEND_DEBUG=0
-       C_FLAGS += -opt intrinsics
-       C_FLAGS += -opt level=4
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp          \
-         @$(APACHE_DIR)/lib/httpd.imp   \
-         @$(APACHE_DIR)/lib/aprlib.imp  \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = php5_module
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.c
-       @echo Compiling $?...
-       @$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-       @echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-       @echo Import $(API) >> $(basename $@).def
-endif
-       @echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-       @echo Export $(EXPORT) >> $(basename $@).def
-endif
-       @echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-       @echo Debug >> $(basename $@).def
-endif
-       @echo Flag_On 0x00000008 >> $(basename $@).def
-       @echo Start _lib_start >> $(basename $@).def
-       @echo Exit _lib_stop >> $(basename $@).def
-
-       $(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-       @echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-       @echo Linking $@...
-       @echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-       @echo $(LIBRARY) >> $(basename $@).link
-endif
-       @echo $(OBJECTS) $(APACHE_DIR)/lib/libpre.obj >> $(basename $@).link
-
-       @$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-       @echo Deleting MAP, DEF files, etc....
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-       -@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/php5cli.mak b/netware/php5cli.mak
deleted file mode 100644 (file)
index 30a1896..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ../..
-
-# Module details
-MODULE_NAME = php
-MODULE_DESC = "PHP 5 - Command Line Interface"
-VMAJ = 2
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = getopt.c \
-        php_cli.c
-
-# Library files
-LIBRARY =
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-       BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -w nounusedarg -msext on
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS += -DNETWARE -DTHREAD_SWITCH
-C_FLAGS += -DZTS
-C_FLAGS += -DNLM_PLATFORM
-C_FLAGS += -DN_PLAT_NLM -DNLM=1 -D__NO_MATH_OPS
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED -DAPACHE_OS_H -DNO_USE_SIGACTION -DMULTITHREAD
-C_FLAGS += -DNEW_LIBC
-C_FLAGS += -I. -I- -I. -I../../netware -I$(SDK_DIR)/include            # ../../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-C_FLAGS += -I- -I../../main -I../../Zend -I../../TSRM -I../../ext/standard
-C_FLAGS += -I../../ -I../../netware -I$(PROJECT_ROOT)/regex
-C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
-       C_FLAGS += -r -DZEND_DEBUG=1
-       C_FLAGS += -exc cw
-       LD_FLAGS += -sym on -sym codeview4 -sym internal -osym $(SYM_FILE) 
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-       C_FLAGS  += -opt speed -inline on -inline smart -inline auto -sym off -DZEND_DEBUG=0
-       C_FLAGS += -opt intrinsics
-       C_FLAGS += -opt level=4
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-
-# Dependencies
-MODULE = LibC   \
-         phplib
-IMPORT = @$(SDK_DIR)/imports/libc.imp        \
-         @$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = 
-API    =
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-
-$(OBJ_DIR)/%.obj: %.c
-       @echo Compiling $?...
-       @$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-       @echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-       @echo Import $(API) >> $(basename $@).def
-endif
-       @echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-       @echo Export $(EXPORT) >> $(basename $@).def
-endif
-       @echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-       @echo Debug >> $(basename $@).def
-endif
-       @echo Flag_On 0x00000008 >> $(basename $@).def
-       @echo Start _LibCPrelude >> $(basename $@).def
-       @echo Exit _LibCPostlude >> $(basename $@).def
-
-       $(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-       @echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-       @echo Linking $@...
-       @echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-       @echo $(LIBRARY) >> $(basename $@).link
-endif
-       @echo $(OBJECTS) >> $(basename $@).link
-
-       @$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-       @echo Deleting MAP, DEF files, etc....
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-       -@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/phplib.imp b/netware/phplib.imp
deleted file mode 100644 (file)
index d1ecedc..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-_array_init,
-_convert_to_string,
-_ecalloc,
-_efree,
-_emalloc,
-_erealloc,
-_estrdup,
-_estrndup,
-_object_and_properties_init,
-_object_init,
-_object_init_ex,
-_php_stream_cast,
-_php_stream_free,
-_php_stream_open_wrapper_ex,
-_zend_get_parameters_array,
-_zend_get_parameters_array_ex,
-_zend_list_addref,
-_zend_list_delete,
-_zend_list_find,
-_zval_copy_ctor,
-_zval_dtor,
-_zval_ptr_dtor,
-add_assoc_bool_ex,
-add_assoc_long_ex,
-add_assoc_zval_ex,
-add_index_null,
-add_index_long,
-add_index_zval,
-add_assoc_string_ex,
-add_assoc_stringl_ex,
-add_assoc_null_ex,
-add_index_string,
-add_index_stringl,
-add_next_index_bool,
-add_next_index_long,
-add_next_index_string,
-add_next_index_stringl,
-add_next_index_zval,
-add_property_long_ex,
-add_property_string_ex,
-call_user_function,
-compiler_globals_id,
-convert_to_boolean,
-convert_to_array,
-convert_to_double,
-convert_to_long,
-core_globals_id,
-display_ini_entries,
-display_link_numbers,
-empty_string,
-executor_globals_id,
-expand_filepath,
-get_zend_version,
-get_active_function_name,
-highlight_file,
-le_index_ptr,
-module_registry,
-multi_convert_to_long_ex,
-open_file_for_scanning,
-php_addslashes,
-php_check_open_basedir,
-php_checkuid,
-php_execute_script,
-php_fopen_primary_script,
-php_handle_aborted_connection,
-php_handle_special_queries,
-php_body_write,
-php_end_ob_buffers,
-php_error_docref0,
-php_get_current_user,
-php_get_highlight_struct,
-php_handle_auth_data,
-php_header,
-php_header_write,
-php_import_environment_variables,
-php_info_print_table_end,
-php_info_print_table_colspan_header,
-php_info_print_table_header,
-php_info_print_table_row,
-php_info_print_table_start,
-php_lint_script,
-php_log_err,
-php_module_shutdown,
-php_module_shutdown_for_exec,
-php_module_shutdown_wrapper,
-php_module_startup,
-php_ob_set_internal_handler,
-php_output_activate,
-php_output_set_status,
-php_output_startup,
-php_print_info,
-php_printf,
-php_regcomp,
-php_regexec,
-php_regfree,
-php_register_variable,
-php_request_shutdown,
-php_request_shutdown_for_exec,
-php_request_startup,
-php_sig_gif,
-php_sig_jpg,
-php_sig_png,
-php_start_ob_buffer,
-php_strip_tags,
-php_strip_url_passwd,
-php_stripslashes,
-php_strlcpy,
-php_strtolower,
-php_strtoupper,
-php_write,
-sapi_add_header_ex,
-sapi_free_header,
-sapi_get_default_content_type,
-sapi_globals_id,
-sapi_shutdown,
-sapi_startup,
-second_arg_force_ref,
-ts_allocate_id,
-ts_resource_ex,
-tsrm_shutdown,
-tsrm_startup,
-virtual_filepath,
-virtual_fopen,
-zend_alter_ini_entry,
-zend_error,
-zend_eval_string,
-zend_execute_scripts,
-zend_extensions,
-zend_fetch_resource,
-zend_get_parameters_ex,
-zend_hash_add_or_update,
-zend_hash_apply,
-zend_hash_apply_with_argument,
-zend_hash_clean,
-zend_hash_del_key_or_index,
-zend_hash_destroy,
-zend_hash_exists,
-zend_hash_find,
-zend_hash_get_current_key_ex,
-zend_hash_get_current_data_ex,
-zend_hash_index_find,
-zend_hash_index_update_or_next_insert,
-zend_hash_init,
-zend_hash_init_ex,
-zend_hash_internal_pointer_reset_ex
-zend_hash_merge_ex,
-zend_hash_move_forward_ex,
-zend_hash_num_elements,
-zend_highlight,
-zend_ini_deactivate,
-zend_ini_boolean_displayer_cb,
-zend_ini_string,
-zend_list_insert,
-zend_llist_add_element,
-zend_llist_apply,
-zend_llist_apply_with_argument,
-zend_llist_destroy,
-zend_llist_init,
-zend_load_extension,
-zend_parse_parameters,
-zend_parse_parameters_ex,
-zend_printf,
-zend_register_ini_entries,
-zend_register_internal_class,
-zend_register_list_destructors_ex,
-zend_register_long_constant,
-zend_register_resource,
-zend_startup_module,
-zend_standard_class_def,
-zend_strip,
-zend_unregister_ini_entries,
-zend_wrong_param_count,
-zval_add_ref,
-OnUpdateBool,
-OnUpdateLong,
-OnUpdateString,
-OnUpdateStringUnempty
diff --git a/netware/phplib.mak b/netware/phplib.mak
deleted file mode 100644 (file)
index 1d22fcd..0000000
+++ /dev/null
@@ -1,400 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = .
-
-# Module details
-MODULE_NAME = phplib
-MODULE_DESC = "PHP 5 - Script Interpreter and Library"
-VMAJ = 3
-VMIN = 0
-VREV = 0
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-C_SRC = ext/bcmath/bcmath.c \
-        ext/bcmath/libbcmath/src/add.c \
-        ext/bcmath/libbcmath/src/compare.c \
-        ext/bcmath/libbcmath/src/debug.c \
-        ext/bcmath/libbcmath/src/div.c \
-        ext/bcmath/libbcmath/src/divmod.c \
-        ext/bcmath/libbcmath/src/doaddsub.c \
-        ext/bcmath/libbcmath/src/init.c \
-        ext/bcmath/libbcmath/src/int2num.c \
-        ext/bcmath/libbcmath/src/nearzero.c \
-        ext/bcmath/libbcmath/src/neg.c \
-        ext/bcmath/libbcmath/src/num2long.c \
-        ext/bcmath/libbcmath/src/num2str.c \
-        ext/bcmath/libbcmath/src/outofmem.c \
-        ext/bcmath/libbcmath/src/output.c \
-        ext/bcmath/libbcmath/src/raise.c \
-        ext/bcmath/libbcmath/src/raisemod.c \
-        ext/bcmath/libbcmath/src/recmul.c \
-        ext/bcmath/libbcmath/src/rmzero.c \
-        ext/bcmath/libbcmath/src/rt.c \
-        ext/bcmath/libbcmath/src/sqrt.c \
-        ext/bcmath/libbcmath/src/str2num.c \
-        ext/bcmath/libbcmath/src/sub.c \
-        ext/bcmath/libbcmath/src/zero.c \
-        ext/calendar/cal_unix.c \
-        ext/calendar/calendar.c \
-        ext/calendar/dow.c \
-        ext/calendar/easter.c \
-        ext/calendar/french.c \
-        ext/calendar/gregor.c \
-        ext/calendar/jewish.c \
-        ext/calendar/julian.c \
-        ext/ftp/ftp.c \
-        ext/ftp/php_ftp.c \
-        ext/mcal/php_mcal.c \
-        ext/pcre/php_pcre.c \
-        ext/pcre/pcrelib/chartables.c \
-        ext/pcre/pcrelib/get.c \
-        ext/pcre/pcrelib/maketables.c \
-        ext/pcre/pcrelib/pcre.c \
-        ext/pcre/pcrelib/pcreposix.c \
-        ext/pcre/pcrelib/study.c \
-        ext/session/mod_files.c \
-        ext/session/mod_mm.c \
-        ext/session/mod_user.c \
-        ext/session/session.c \
-        ext/snmp/snmp.c \
-        ext/standard/aggregation.c \
-        ext/standard/array.c \
-        ext/standard/assert.c \
-        ext/standard/base64.c \
-        ext/standard/basic_functions.c \
-        ext/standard/browscap.c \
-        ext/standard/crc32.c \
-        ext/standard/credits.c \
-        ext/standard/css.c \
-        ext/standard/cyr_convert.c \
-        ext/standard/datetime.c \
-        ext/standard/dir.c \
-        ext/standard/dl.c \
-        ext/standard/dns.c \
-        ext/standard/exec.c \
-        ext/standard/file.c \
-        ext/standard/filestat.c \
-        ext/standard/filters.c \
-        ext/standard/flock_compat.c \
-        ext/standard/formatted_print.c \
-        ext/standard/fsock.c \
-        ext/standard/ftok.c \
-        ext/standard/ftp_fopen_wrapper.c \
-        ext/standard/head.c \
-        ext/standard/html.c \
-        ext/standard/http_fopen_wrapper.c \
-        ext/standard/image.c \
-        ext/standard/incomplete_class.c \
-        ext/standard/info.c \
-        ext/standard/iptc.c \
-        ext/standard/lcg.c \
-        ext/standard/levenshtein.c \
-        ext/standard/link.c \
-        ext/standard/mail.c \
-        ext/standard/math.c \
-        ext/standard/md5.c \
-        ext/standard/metaphone.c \
-        ext/standard/microtime.c \
-        ext/standard/pack.c \
-        ext/standard/pageinfo.c \
-        ext/standard/php_fopen_wrapper.c \
-        ext/standard/quot_print.c \
-        ext/standard/rand.c \
-        ext/standard/reg.c \
-        ext/standard/scanf.c \
-        ext/standard/sha1.c \
-        ext/standard/soundex.c \
-        ext/standard/string.c \
-        ext/standard/strnatcmp.c \
-        ext/standard/type.c \
-        ext/standard/uniqid.c \
-        ext/standard/url.c \
-        ext/standard/url_scanner.c \
-        ext/standard/url_scanner_ex.c \
-        ext/standard/user_filters.c \
-        ext/standard/var.c \
-        ext/standard/var_unserializer.c \
-        ext/standard/versioning.c \
-        main/fopen_wrappers.c \
-        main/internal_functions_nw.c \
-        main/main.c \
-        main/memory_streams.c \
-        main/mergesort.c \
-        main/network.c \
-        main/output.c \
-        main/php_content_types.c \
-        main/php_ini.c \
-        main/php_logos.c \
-        main/php_open_temporary_file.c \
-        main/php_sprintf.c \
-        main/php_ticks.c \
-        main/php_variables.c \
-        main/reentrancy.c \
-        main/rfc1867.c \
-        main/safe_mode.c \
-        main/SAPI.c \
-        main/snprintf.c \
-        main/spprintf.c \
-        main/streams.c \
-        main/strlcat.c \
-        main/strlcpy.c \
-        main/user_streams.c \
-        netware/geterrnoptr.c \
-        netware/mktemp.c \
-        netware/pipe.c \
-        netware/pwd.c \
-        netware/start.c \
-        netware/time_nw.c \
-        netware/wfile.c \
-        regex/regcomp.c \
-        regex/regerror.c \
-        regex/regexec.c \
-        regex/regfree.c \
-#        ext/standard/crypt.c \
-#        ext/com/COM.c \
-#        ext/com/conversion.c \
-#        ext/odbc/php_odbc.c \
-#        ext/snmp/winsnmp.c \
-#        netware/winutil.c \
-#        netware/registry.c \
-#        main/alloca.c \
-#        ext/wddx/wddx.c \
-#        netware/readdir.c \
-
-WIN32_C_SRC = sendmail.c \
-
-
-CPP_SRC_NODIR = $(notdir $(CPP_SRC))
-C_SRC_NODIR = $(notdir $(C_SRC))
-SRC_DIR = $(dir $(CPP_SRC) $(C_SRC))
-
-# Library files
-LIBRARY  = $(PROJECT_ROOT)/Zend/$(BUILD)/Zend.lib $(PROJECT_ROOT)/TSRM/$(BUILD)/TSRM.lib
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
-OBJECTS  = $(join $(SRC_DIR), $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.obj) $(C_SRC_NODIR:.c=.obj)))
-WIN32_OBJECTS  = $(addprefix $(OBJ_DIR)/,$(WIN32_C_SRC:.c=.obj))
-DEPDS  = $(join $(SRC_DIR), $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.d) $(C_SRC_NODIR:.c=.d)))
-
-# Binary file
-ifndef BINARY
-       BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
-endif
-
-# Compile flags
-C_FLAGS += -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc -nosyspath
-C_FLAGS  += -DNETWARE -D__BIT_TYPES_DEFINED__ -DZTS
-C_FLAGS  += -DPHP5DLLTS_EXPORTS -DPHP_EXPORTS -DLIBZEND_EXPORTS -DTSRM_EXPORTS -DSAPI_EXPORTS
-C_FLAGS  += -DHAVE_SYS_TIME_H -DHAVE_STRUCT_FLOCK -DVIRTUAL_DIR -DHAVE_TZNAME
-C_FLAGS  += -DHAVE_DLFCN_H -DHAVE_LIBDL
-C_FLAGS  += -DCLIB_STAT_PATCH          # stat patch
-C_FLAGS  += -DNEW_LIBC -DHAVE_ARPA_INET_H=1 -DHAVE_NETINET_IN_H=1 -DHAVE_INET_ATON=1
-
-C_FLAGS  += -DLINK_SIZE=2              # Added for the new definition in ext\pcre\pcrelib\internal.h
-# Below added for the file ext\pcre\pcrelib\pcreposix.c and
-# the default value is what is defined in the changelog file
-C_FLAGS  += -DPOSIX_MALLOC_THRESHOLD=5
-
-C_FLAGS  += -I. -Imain -Inetware -Iregex -IZend -ITSRM
-C_FLAGS  += -Iext/standard -Iext/mcal -Iext/pcre -Iext/pcre/pcrelib
-C_FLAGS  += -Iext/bcmath -Iext/bcmath/libbcmath/src
-C_FLAGS  += -Iext/odbc -Iext/session -Iext/ftp -Iext/wddx -Iext/calendar -Iext/snmp
-C_FLAGS  += -I- -Inetware -I$(SDK_DIR)/include -I$(MWCIncludes)        # netware added for special SYS/STAT.H : Venkat(6/2/02)
-C_FLAGS  += -Iwin32
-C_FLAGS  += -I$(SDK_DIR)/include/winsock       # Added for socket calls
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics 
-       C_FLAGS += -D_DEBUG -DZEND_DEBUG=1
-       LD_FLAGS += -sym codeview4 -sym internal -osym $(SYM_FILE) 
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-else
-       C_FLAGS  += -opt speed -inline on -inline auto -sym off -DZEND_DEBUG=0
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Dependencies
-MODULE = LibC
-IMPORT = @$(SDK_DIR)/imports/libc.imp   \
-         @$(SDK_DIR)/imports/ws2nlm.imp \
-         @$(MPK_DIR)/import/mpkOrg.imp
-EXPORT = @$(PROJECT_ROOT)/netware/phplib.imp
-API = NXGetEnvCount \
-      NXCopyEnv \
-      OutputToScreen \
-      bsd_fd_set
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c . win32
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist main\$(OBJ_DIR)                     md main\$(OBJ_DIR)
-       @if not exist regex\$(OBJ_DIR)                    md regex\$(OBJ_DIR)
-       @if not exist netware\$(OBJ_DIR)                  md netware\$(OBJ_DIR)
-       @if not exist ext\standard\$(OBJ_DIR)             md ext\standard\$(OBJ_DIR)
-       @if not exist ext\bcmath\$(OBJ_DIR)               md ext\bcmath\$(OBJ_DIR)
-       @if not exist ext\bcmath\libbcmath\src\$(OBJ_DIR) md ext\bcmath\libbcmath\src\$(OBJ_DIR)
-       @if not exist ext\mcal\$(OBJ_DIR)                 md ext\mcal\$(OBJ_DIR)
-       @if not exist ext\pcre\$(OBJ_DIR)                 md ext\pcre\$(OBJ_DIR)
-       @if not exist ext\pcre\pcrelib\$(OBJ_DIR)         md ext\pcre\pcrelib\$(OBJ_DIR)
-       @if not exist ext\odbc\$(OBJ_DIR)                 md ext\odbc\$(OBJ_DIR)
-       @if not exist ext\session\$(OBJ_DIR)              md ext\session\$(OBJ_DIR)
-       @if not exist ext\ftp\$(OBJ_DIR)                  md ext\ftp\$(OBJ_DIR)
-       @if not exist ext\wddx\$(OBJ_DIR)                 md ext\wddx\$(OBJ_DIR)
-       @if not exist ext\calendar\$(OBJ_DIR)             md ext\calendar\$(OBJ_DIR)
-       @if not exist ext\snmp\$(OBJ_DIR)                 md ext\snmp\$(OBJ_DIR)
-       @if not exist $(FINAL_DIR)                        md $(FINAL_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-%.d: ../%.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-       
-%.obj: ../%.c
-       @echo Compiling $?...
-# writing the flags to a file. Otherwise fails on win95 due too many characters in command line.
-       @echo $(wordlist 1, 20, $(C_FLAGS)) > $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-       @echo $(wordlist 21, 40, $(C_FLAGS)) >> $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-       @echo $(wordlist 41, 60, $(C_FLAGS)) >> $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-       @echo $(wordlist 61, 80, $(C_FLAGS)) >> $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-       @$(CC) $< @$(basename $(OBJ_DIR)\$(notdir $@)).cfg -o $@ 
-       @del $(basename $(OBJ_DIR)\$(notdir $@)).cfg
-
-
-$(BINARY): $(OBJECTS) $(WIN32_OBJECTS) $(LIBRARY)
-       @echo Import $(IMPORT) > $(basename $@).def
-ifdef API
-       @echo Import $(API) >> $(basename $@).def
-endif
-       @echo Module $(MODULE) >> $(basename $@).def
-ifdef EXPORT
-       @echo Export $(EXPORT) >> $(basename $@).def
-endif
-       @echo AutoUnload >> $(basename $@).def
-ifeq '$(BUILD)' 'debug'
-       @echo Debug >> $(basename $@).def
-endif
-       @echo Flag_On 0x00000008 >> $(basename $@).def
-       @echo Start _LibCPrelude >> $(basename $@).def
-       @echo Exit _LibCPostlude >> $(basename $@).def
-
-       $(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
-       @echo xdcdata $(basename $@).xdc >> $(basename $@).def
-
-       @echo Linking $@...
-       @echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
-ifdef LIBRARY
-       @echo $(LIBRARY) >> $(basename $@).link
-endif
-       @echo $(wordlist   1,  10, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist  11,  20, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist  21,  30, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist  31,  40, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist  41,  50, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist  51,  60, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist  61, 70, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 71, 80, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 81, 85, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 86, 90, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 91, 95, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 96, 100, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 101, 105, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 106, 110, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 111, 115, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 116, 120, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 121, 125, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 126, 130, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 131, 135, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 136, 140, $(OBJECTS)) >> $(basename $@).link
-       @echo $(wordlist 141, 141, $(OBJECTS)) >> $(basename $@).link
-
-       @echo $(wordlist 1, 2, $(WIN32_OBJECTS)) >> $(basename $@).link
-
-       @$(LINK) @$(basename $@).link
-
-
-.PHONY: clean
-clean: cleansrc cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "main\$(OBJ_DIR)\*.d"
-       -@del "regex\$(OBJ_DIR)\*.d"
-       -@del "netware\$(OBJ_DIR)\*.d"
-       -@del "ext\standard\$(OBJ_DIR)\*.d"
-       -@del "ext\bcmath\$(OBJ_DIR)\*.d"
-       -@del "ext\bcmath\libbcmath\src\$(OBJ_DIR)\*.d"
-       -@del "ext\mcal\$(OBJ_DIR)\*.d"
-       -@del "ext\pcre\$(OBJ_DIR)\*.d"
-       -@del "ext\pcre\pcrelib\$(OBJ_DIR)\*.d"
-       -@del "ext\odbc\$(OBJ_DIR)\*.d"
-       -@del "ext\session\$(OBJ_DIR)\*.d"
-       -@del "ext\ftp\$(OBJ_DIR)\*.d"
-       -@del "ext\wddx\$(OBJ_DIR)\*.d"
-       -@del "ext\calendar\$(OBJ_DIR)\*.d"
-       -@del "ext\snmp\$(OBJ_DIR)\*.d"
-
-.PHONY: cleansrc
-cleansrc:
-       @echo Deleting all generated source files...
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "main\$(OBJ_DIR)\*.obj"
-       -@del "regex\$(OBJ_DIR)\*.obj"
-       -@del "netware\$(OBJ_DIR)\*.obj"
-       -@del "ext\standard\$(OBJ_DIR)\*.obj"
-       -@del "ext\bcmath\$(OBJ_DIR)\*.obj"
-       -@del "ext\bcmath\libbcmath\src\$(OBJ_DIR)\*.obj"
-       -@del "ext\mcal\$(OBJ_DIR)\*.obj"
-       -@del "ext\pcre\$(OBJ_DIR)\*.obj"
-       -@del "ext\pcre\pcrelib\$(OBJ_DIR)\*.obj"
-       -@del "ext\odbc\$(OBJ_DIR)\*.obj"
-       -@del "ext\session\$(OBJ_DIR)\*.obj"
-       -@del "ext\ftp\$(OBJ_DIR)\*.obj"
-       -@del "ext\wddx\$(OBJ_DIR)\*.obj"
-       -@del "ext\calendar\$(OBJ_DIR)\*.obj"
-       -@del "ext\snmp\$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
-       @echo Deleting MAP, DEF files, etc....
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).map"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).def"
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).link"
-ifeq '$(BUILD)' 'debug'
-       -@del $(FINAL_DIR)\$(MODULE_NAME).sym
-endif
diff --git a/netware/phptest.ncf b/netware/phptest.ncf
deleted file mode 100644 (file)
index 9cb599e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-php -q run-tests.php > results.txt
\ No newline at end of file
diff --git a/netware/postgres_ext.h b/netware/postgres_ext.h
deleted file mode 100644 (file)
index 9b79a23..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * postgres_ext.h
- *
- *        This file contains declarations of things that are visible everywhere
- *     in PostgreSQL *and* are visible to clients of frontend interface libraries.
- *     For example, the Oid type is part of the API of libpq and other libraries.
- *
- *        Declarations which are specific to a particular interface should
- *     go in the header file for that interface (such as libpq-fe.h).  This
- *     file is only for fundamental Postgres declarations.
- *
- *        User-written C functions don't count as "external to Postgres."
- *     Those function much as local modifications to the backend itself, and
- *     use header files that are otherwise internal to Postgres to interface
- *     with the backend.
- *
- * $Id$
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef POSTGRES_EXT_H
-#define POSTGRES_EXT_H
-
-/*
- * Object ID is a fundamental type in Postgres.
- */
-typedef unsigned int Oid;
-
-#define InvalidOid             ((Oid) 0)
-
-#define OID_MAX  UINT_MAX
-/* you will need to include <limits.h> to use the above #define */
-
-
-/*
- * NAMEDATALEN is the max length for system identifiers (e.g. table names,
- * attribute names, function names, etc.)
- *
- * NOTE that databases with different NAMEDATALEN's cannot interoperate!
- */
-#define NAMEDATALEN 32
-
-#endif
diff --git a/netware/setbuild.bat b/netware/setbuild.bat
deleted file mode 100755 (executable)
index a168562..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-
-if "%1" == "/?" goto USAGE
-
-if "%1" == "d" set BUILD=debug
-if "%1" == "r" set BUILD=release
-
-if "%2" == "1" set APACHE_VER=1.3
-if "%2" == "2" set APACHE_VER=2
-
-goto EXIT
-
-:USAGE
- @echo on
- @echo Usage: setbuild d|r 1|2
- @echo set build type as 'debug' or 'release'
- @echo set Web Server as Apache 1.3.x or Apache 2.0.x
-
-:EXIT
\ No newline at end of file
diff --git a/netware/time_nw.c b/netware/time_nw.c
deleted file mode 100644 (file)
index 195f18c..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-
-/*****************************************************************************
- *                                                                           *
- * DH_TIME.C                                                                 *
- *                                                                           *
- * Freely redistributable and modifiable.  Use at your own risk.             *
- *                                                                           *
- * Copyright 1994 The Downhill Project                                       *
- * 
- * Modified by Shane Caraveo for use with PHP
- *
- *****************************************************************************/
-
-/* $Id$ */
-
- /**
-  *
-  * 04-Feb-2001
-  *   - Added patch by "Vanhanen, Reijo" <Reijo.Vanhanen@helsoft.fi>
-  *     Improves accuracy of msec
-  */
-
-/* Include stuff ************************************************************ */
-
-#include "time_nw.h"
-#include "unistd.h"
-#include "signal.h"
-/*#include <winbase.h>
-#include <mmsystem.h>*/
-#include <errno.h>
-/*
-int getfilesystemtime(struct timeval *time_Info) 
-{
-FILETIME ft;
-__int64 ff;
-
-    GetSystemTimeAsFileTime(&ft);   *//* 100 ns blocks since 01-Jan-1641 *//*
-                                    *//* resolution seems to be 0.01 sec *//*
-    ff = *(__int64*)(&ft);
-    time_Info->tv_sec = (int)(ff/(__int64)10000000-(__int64)11644473600);
-    time_Info->tv_usec = (int)(ff % 10000000)/10;
-    return 0;
-}
-*/
-
-int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Info)
-{
-#ifdef NETWARE
-    return 0;
-#else
-       static struct timeval starttime = {0, 0};
-       static __int64 lasttime = 0;
-       static __int64 freq = 0;
-       __int64 timer;
-       LARGE_INTEGER li;
-       BOOL b;
-       double dt;
-
-       /* Get the time, if they want it */
-       if (time_Info != NULL) {
-               if (starttime.tv_sec == 0) {
-            b = QueryPerformanceFrequency(&li);
-            if (!b) {
-                starttime.tv_sec = -1;
-            }
-            else {
-                freq = li.QuadPart;
-                b = QueryPerformanceCounter(&li);
-                if (!b) {
-                    starttime.tv_sec = -1;
-                }
-                else {
-                    getfilesystemtime(&starttime);
-                    timer = li.QuadPart;
-                    dt = (double)timer/freq;
-                    starttime.tv_usec -= (int)((dt-(int)dt)*1000000);
-                    if (starttime.tv_usec < 0) {
-                        starttime.tv_usec += 1000000;
-                        --starttime.tv_sec;
-                    }
-                    starttime.tv_sec -= (int)dt;
-                }
-            }
-        }
-        if (starttime.tv_sec > 0) {
-            b = QueryPerformanceCounter(&li);
-            if (!b) {
-                starttime.tv_sec = -1;
-            }
-            else {
-                timer = li.QuadPart;
-                if (timer < lasttime) {
-                    getfilesystemtime(time_Info);
-                    dt = (double)timer/freq;
-                    starttime = *time_Info;
-                    starttime.tv_usec -= (int)((dt-(int)dt)*1000000);
-                    if (starttime.tv_usec < 0) {
-                        starttime.tv_usec += 1000000;
-                        --starttime.tv_sec;
-                    }
-                    starttime.tv_sec -= (int)dt;
-                }
-                else {
-                    lasttime = timer;
-                    dt = (double)timer/freq;
-                    time_Info->tv_sec = starttime.tv_sec + (int)dt;
-                    time_Info->tv_usec = starttime.tv_usec + (int)((dt-(int)dt)*1000000);
-                    if (time_Info->tv_usec > 1000000) {
-                        time_Info->tv_usec -= 1000000;
-                        ++time_Info->tv_sec;
-                    }
-                }
-            }
-        }
-        if (starttime.tv_sec < 0) {
-            getfilesystemtime(time_Info);
-        }
-
-       }
-       /* Get the timezone, if they want it */
-       if (timezone_Info != NULL) {
-               _tzset();
-               timezone_Info->tz_minuteswest = _timezone;
-               timezone_Info->tz_dsttime = _daylight;
-       }
-       /* And return */
-       return 0;
-#endif
-}
-
-
-/* this usleep isnt exactly accurate but should do ok */
-/*
-void usleep(unsigned int useconds)
-{
-struct timeval tnow, tthen, t0;
-
-       gettimeofday(&tthen, NULL);
-    t0 = tthen;
-    tthen.tv_usec += useconds;
-    while (tthen.tv_usec > 1000000) {
-        tthen.tv_usec -= 1000000;
-        tthen.tv_sec++;
-    }
-    
-       if (useconds > 10000) {
-        useconds -= 10000;
-        Sleep(useconds/1000);
-    }
-    
-       while (1) {
-        gettimeofday(&tnow, NULL);
-        if (tnow.tv_sec > tthen.tv_sec) {
-            break;
-        }
-        if (tnow.tv_sec == tthen.tv_sec) {
-            if (tnow.tv_usec > tthen.tv_usec) {
-                break;
-            }
-        }
-    }
-}
-*/
-
-#ifdef HAVE_SETITIMER
-
-/*
-#ifndef THREAD_SAFE
-unsigned int proftimer, virttimer, realtimer;
-extern LPMSG phpmsg;
-#endif
-
-struct timer_msg {
-       int signal;
-       unsigned int threadid;
-};
-
-
-LPTIMECALLBACK setitimer_timeout(UINT uTimerID, UINT info, DWORD dwUser, DWORD dw1, DWORD dw2)
-{
-       struct timer_msg *msg = (struct timer_msg *) info;
-
-       if (msg) {
-               raise((int) msg->signal);
-               PostThreadMessage(msg->threadid,
-                                                 WM_NOTIFY, msg->signal, 0);
-               free(msg);
-       }
-       return 0;
-}
-
-int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue)
-{
-       int timeout = value->it_value.tv_sec * 1000 + value->it_value.tv_usec;
-       int repeat = TIME_ONESHOT;
-*/
-       /*make sure the message queue is initialized *//*
-       PeekMessage(phpmsg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
-       if (timeout > 0) {
-               struct timer_msg *msg = malloc(sizeof(struct timer_msg));
-               msg->threadid = GetCurrentThreadId();
-               if (!ovalue) {
-                       repeat = TIME_PERIODIC;
-               }
-               switch (which) {
-                       case ITIMER_REAL:
-                               msg->signal = SIGALRM;
-                               realtimer = timeSetEvent(timeout, 100, (LPTIMECALLBACK) setitimer_timeout, (UINT) msg, repeat);
-                               break;
-                       case ITIMER_VIRT:
-                               msg->signal = SIGVTALRM;
-                               virttimer = timeSetEvent(timeout, 100, (LPTIMECALLBACK) setitimer_timeout, (UINT) msg, repeat);
-                               break;
-                       case ITIMER_PROF:
-                               msg->signal = SIGPROF;
-                               proftimer = timeSetEvent(timeout, 100, (LPTIMECALLBACK) setitimer_timeout, (UINT) msg, repeat);
-                               break;
-                       default:
-                               errno = EINVAL;
-                               return -1;
-                               break;
-               }
-       } else {
-               switch (which) {
-                       case ITIMER_REAL:
-                               timeKillEvent(realtimer);
-                               break;
-                       case ITIMER_VIRT:
-                               timeKillEvent(virttimer);
-                               break;
-                       case ITIMER_PROF:
-                               timeKillEvent(proftimer);
-                               break;
-                       default:
-                               errno = EINVAL;
-                               return -1;
-                               break;
-               }
-       }
-
-
-       return 0;
-}
-*/
-#endif
diff --git a/netware/tsrm.mak b/netware/tsrm.mak
deleted file mode 100644 (file)
index d0088ec..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ..
-
-# Module details
-MODULE_NAME = TSRM
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-# Source files
-CPP_SRC = 
-C_SRC = TSRM.c \
-        tsrm_nw.c \
-        tsrm_strtok_r.c \
-        tsrm_virtual_cwd.c
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-       BINARY=$(FINAL_DIR)\$(MODULE_NAME).lib
-endif
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle gcc
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS  += -DZTS -DNETWARE -DHAVE_DIRENT_H=1
-C_FLAGS  += -DNEW_LIBC
-C_FLAGS  += -DUSE_MKFIFO
-C_FLAGS  += -DCLIB_STAT_PATCH
-#C_FLAGS  += -DUSE_MPK         # To use the LibC recursive mutex locking
-C_FLAGS  += -I. -I- -I../netware -I$(SDK_DIR)/include  # ../netware added for special SYS/STAT.H
-C_FLAGS  += -I$(MPK_DIR)/include1
-C_FLAGS  += -I$(MWCIncludes)
-
-
-# Link flags
-LD_FLAGS  = -type library
-LD_FLAGS += -o $(BINARY)
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics -DTSRM_DEBUG=1
-       LD_FLAGS += -sym codeview4 -sym internal
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-       C_FLAGS  += -opt speed -inline smart -inline auto -sym off -DTSRM_DEBUG=0
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-$(OBJ_DIR)/%.d: %.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-       
-$(OBJ_DIR)/%.obj: %.c
-       @echo Compiling $?...
-       @$(CC) $< $(C_FLAGS) -o $@
-
-$(BINARY): $(OBJECTS)
-       @echo Linking $@...
-       @$(LINK) $(LD_FLAGS) $(OBJECTS)
-
-
-.PHONY: clean
-clean: cleanobj cleanbin
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).lib"
diff --git a/netware/zend.mak b/netware/zend.mak
deleted file mode 100644 (file)
index 77b1074..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-# Temporarily here -- later may go into some batch file
-# which will set this as an environment variable
-PROJECT_ROOT = ..
-
-# Module details
-MODULE_NAME = ZEND
-
-#include the common settings
-include $(PROJECT_ROOT)/netware/common.mif
-
-# Extensions of all input and output files
-.SUFFIXES:
-.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
-
-C_SRC = zend.c \
-        zend_alloc.c \
-        zend_API.c \
-        zend_builtin_functions.c \
-        zend_compile.c \
-        zend_constants.c \
-        zend_dynamic_array.c \
-        zend_execute.c \
-        zend_execute_API.c \
-        zend_extensions.c \
-        zend_hash.c \
-        zend_highlight.c \
-        zend_indent.c \
-        zend_ini.c \
-        zend_ini_parser.c \
-        zend_ini_scanner.c \
-        zend_language_parser.c \
-        zend_language_scanner.c \
-        zend_list.c \
-        zend_llist.c \
-        zend_multibyte.c \
-        zend_opcode.c \
-        zend_operators.c \
-        zend_ptr_stack.c \
-        zend_qsort.c \
-        zend_sprintf.c \
-        zend_stack.c \
-        zend_static_allocator.c \
-        zend_variables.c
-
-
-# Destination directories and files
-OBJ_DIR = $(BUILD)
-FINAL_DIR = $(BUILD)
-OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.obj) $(C_SRC:.c=.obj))
-DEPDS  = $(addprefix $(OBJ_DIR)/,$(CPP_SRC:.cpp=.d) $(C_SRC:.c=.d))
-
-# Binary file
-ifndef BINARY
-       BINARY=$(FINAL_DIR)\$(MODULE_NAME).lib
-endif
-
-
-# Compile flags
-C_FLAGS  = -c -maxerrors 25 -msgstyle std
-C_FLAGS += -wchar_t on -bool on
-C_FLAGS += -processor Pentium
-C_FLAGS += -nostdinc
-C_FLAGS += -relax_pointers             # To remove type-casting errors
-C_FLAGS += -D__C9X_CMATH_INLINES_DEFINED
-C_FLAGS += -DNETWARE -DZTS
-C_FLAGS  += -DNEW_LIBC
-C_FLAGS += -DCLIB_STAT_PATCH
-C_FLAGS += -DTHREAD_SWITCH
-
-# These are required to use dlclose so that the PHP extensions are automatically unloaded
-# when apache is unloaded
-C_FLAGS  += -DHAVE_DLFCN_H -DHAVE_LIBDL
-
-C_FLAGS += -I. -I- -I../netware -I$(SDK_DIR)/include   # ../netware added for special SYS/STAT.H
-C_FLAGS += -I$(MWCIncludes)
-
-
-# Link flags
-LD_FLAGS  = -type library
-LD_FLAGS += -o $(BINARY)
-
-
-# Extra stuff based on debug / release builds
-ifeq '$(BUILD)' 'debug'
-       C_FLAGS  += -DZEND_DEBUG=1
-       C_FLAGS  += -inline smart -sym on -sym codeview4 -sym internal -opt off -opt intrinsics
-       LD_FLAGS += -sym codeview4 -sym internal
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
-else
-       C_FLAGS  += -opt speed -inline on -inline auto -sym off
-       C_FLAGS  += -DZEND_DEBUG=0
-       LD_FLAGS += -sym off
-       export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
-endif
-
-
-# Virtual paths
-vpath %.cpp .
-vpath %.c .
-vpath %.obj $(OBJ_DIR)
-
-
-all: prebuild project
-
-.PHONY: all
-
-prebuild:
-       @if not exist $(OBJ_DIR) md $(OBJ_DIR)
-
-project: $(BINARY) $(MESSAGE)
-       @echo Build complete.
-
-
-$(OBJ_DIR)/%.d: %.c
-       @echo Building Dependencies for $(<F)
-       @$(CC) -M $< $(C_FLAGS) -o $@
-       
-$(OBJ_DIR)/%.obj: %.c
-       @echo Compiling $?...
-       @$(CC) $< $(C_FLAGS) -o $@
-
-
-$(BINARY): $(OBJECTS)
-       @echo Linking $@...
-       @$(LINK) $(LD_FLAGS) $(OBJECTS)
-
-
-.PHONY: clean
-clean: cleansrc cleanobj cleanbin
-
-.PHONY: cleansrc
-cleansrc:
-       @echo Deleting all generated source files...
-       -@del "zend_ini_parser.c"
-       -@del "zend_ini_parser.h"
-       -@del "zend_ini_scanner.c"
-       -@del "zend_language_parser.c"
-       -@del "zend_language_parser.h"
-       -@del "zend_language_scanner.c"
-       -@del "zend_ini_parser.output"
-       -@del "zend_language_parser.output"
-
-
-.PHONY: cleand
-cleand:
-       @echo Deleting all dependency files...
-       -@del "$(OBJ_DIR)\*.d"
-
-.PHONY: cleanobj
-cleanobj:
-       @echo Deleting all object files...
-       -@del "$(OBJ_DIR)\*.obj"
-
-.PHONY: cleanbin
-cleanbin:
-       @echo Deleting binary files...
-       -@del "$(FINAL_DIR)\$(MODULE_NAME).lib"
-