From: Kalle Sommer Nielsen Date: Mon, 23 Oct 2017 01:13:53 +0000 (+0200) Subject: Remove these ancient ldap parts for Windows thats no longer relevant X-Git-Tag: php-7.3.0alpha1~1210 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7c23e27bee376403d7494f45f27c46fb1a7c7bb;p=php Remove these ancient ldap parts for Windows thats no longer relevant --- diff --git a/ext/ldap/LDAP_Win32_HOWTO.txt b/ext/ldap/LDAP_Win32_HOWTO.txt deleted file mode 100644 index 30b6096f58..0000000000 --- a/ext/ldap/LDAP_Win32_HOWTO.txt +++ /dev/null @@ -1,33 +0,0 @@ -Rules for building LDAP ------------------------ - -Note 1: During the entire build process, you can ignore warnings about - inconsistent DLL linkage. - - -- Open LDAP under php_build. Rename this directory to 'OpenLDAP'. -- Rename OpenLDAP\include\portable.h.nt to OpenLDAP\include\portable.h -- Rename OpenLDAP\include\ldapconfig.h.nt to OpenLDAP\include\ldapconfig.h -- Launch Visual Studio with OpenLDAP\libraries\libldap\libldap.dsw -- Enter Project->Settings. - Select the C/C++ tab, and select 'Code Generation' in the Category box. - For 'Win32 Debug', change the runtime library to 'Debug Multithreaded DLL' - For 'Win32 Release', change the runtime library to 'Multithreaded DLL' - Select the Preprocessor tab, select 'All Configurations'. - Add '..\..\..\..\php7\regex' to the 'Additional include directories' list. - Add 'HAVE_MKTEMP' to the 'Preprocessor definitions' list. -- Compile (you can compile both Debug and Release versions). - - -- Launch Visual Studio with OpenLDAP\libraries\liblber\liblber.dsw -- Enter Project->Settings. - Select the C/C++ tab, and select 'Code Generation' in the Category box. - For 'Win32 Debug', change the runtime library to 'Debug Multithreaded DLL' - For 'Win32 Release', change the runtime library to 'Multithreaded DLL' - Select the Preprocessor tab, select 'All Configurations'. - Add 'HAVE_MKTEMP' to the 'Preprocessor definitions' list. -- Compile (you can compile both Debug and Release versions). - - -Start Visual Studio, load php_modules.dsw, select the LDAP project, and build -it. diff --git a/ext/ldap/ldap.mak b/ext/ldap/ldap.mak deleted file mode 100644 index f285db0eff..0000000000 --- a/ext/ldap/ldap.mak +++ /dev/null @@ -1,173 +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_ldap -MODULE_DESC = "PHP 7 - LDAP Extension" -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 = ldap.c \ - start.c - -CPP_SRC_NODIR = $(notdir $(CPP_SRC)) -C_SRC_NODIR = $(notdir $(C_SRC)) -SRC_DIR = $(dir $(CPP_SRC) $(C_SRC)) - -# 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_NODIR:.c=.obj) $(C_SRC_NODIR:.c=.obj)) -DEPDS = $(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 += -processor Pentium -C_FLAGS += -nostdinc -nosyspath -C_FLAGS += -relax_pointers # To remove type-casting errors -C_FLAGS += -DNETWARE -DZTS -C_FLAGS += -DNEW_LIBC -C_FLAGS += -DCOMPILE_DL_LDAP -C_FLAGS += -I. -I- -I$(PROJECT_ROOT) -I$(PROJECT_ROOT)/main -C_FLAGS += -I$(PROJECT_ROOT)/ext/standard -I$(PROJECT_ROOT)/netware -C_FLAGS += -I$(PROJECT_ROOT)/zend -I$(PROJECT_ROOT)/tsrm -C_FLAGS += -I$(SDK_DIR)/include -I$(MWCIncludes) -C_FLAGS += -I$(LDAP_DIR)/inc -C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include - -ifndef STACK_SIZE -STACK_SIZE=8192 -endif - -# 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 += -exc cw -DZEND_DEBUG=1 - LD_FLAGS += -sym on -sym codeview4 -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 - C_FLAGS += -opt intrinsics - C_FLAGS += -opt level=4 -DZEND_DEBUG=0 - LD_FLAGS += -sym off - export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib -endif - -# Dependencies -MODULE = LibC \ - ldapsdk \ - phplib -IMPORT = @$(SDK_DIR)/imports/libc.imp \ - @$(SDK_DIR)/imports/ws2nlm.imp \ - @$(MPK_DIR)/import/mpkOrg.imp \ - @$(LDAP_DIR)/lib/nlm/Ldapsdk.imp \ - @$(PROJECT_ROOT)/netware/phplib.imp -EXPORT = ($(MODULE_NAME)) get_module -API = OutputToScreen - - -# Virtual paths -vpath %.cpp . -vpath %.c . ..\..\netware -vpath %.obj $(OBJ_DIR) - - -all: prebuild project - -.PHONY: all - -prebuild: - @if not exist $(OBJ_DIR) md $(OBJ_DIR) - -project: $(BINARY) - @echo Build complete. - -$(OBJ_DIR)/%.d: %.cpp - @echo Building Dependencies for $( $(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 - @echo $(LIBRARY) $(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