com php-src: Unify EOL: win32/build/Makefile.phpize

Commit: 4c9fe5a4907b71e72dac5175d6b1952f0077f988 Author: Anatol Belski <ab@php.net> Mon, 7 Aug 2017 17:03:04 +0200 Parents: d058e3091769b2debdfb2a8d957525dfc94a5e64 Branches: PHP-7.0 PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4c9fe5a4907b71e72dac5175d6b1952f0077f988 Log: Unify EOL Changed paths: M win32/build/Makefile.phpize Diff: diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index ddd1a7b..6b2da35 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -1,33 +1,33 @@ -CC="$(PHP_CL)" -LD="$(LINK)" -MC="$(MC)" -MT="$(MT)" - -PHPSDK_DIR=$(PHP_DIR) -PHPLIB=$(PHPSDK_DIR)\lib\$(PHPLIB) -LDFLAGS=$(LDFLAGS) /libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)" -BUILD_DIR_DEV=$(PHPSDK_DIR) - -all: $(EXT_TARGETS) $(PECL_TARGETS) - -build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) - -clean-pecl: - @echo Cleaning PECL targets only - -rd /s /q $(BUILD_DIR)\pecl - -clean-all: - @echo Cleaning standard build dirs - cd $(BUILD_DIR) - @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D - -@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.manifest $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc $(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll $(BUILD_DIR)\php*.exe > NUL - -clean: clean-pecl - @echo Cleaning distribution build dirs - cd $(BUILD_DIR) - @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL - -@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL - +CC="$(PHP_CL)" +LD="$(LINK)" +MC="$(MC)" +MT="$(MT)" + +PHPSDK_DIR=$(PHP_DIR) +PHPLIB=$(PHPSDK_DIR)\lib\$(PHPLIB) +LDFLAGS=$(LDFLAGS) /libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)" +BUILD_DIR_DEV=$(PHPSDK_DIR) + +all: $(EXT_TARGETS) $(PECL_TARGETS) + +build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) + +clean-pecl: + @echo Cleaning PECL targets only + -rd /s /q $(BUILD_DIR)\pecl + +clean-all: + @echo Cleaning standard build dirs + cd $(BUILD_DIR) + @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D + -@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.manifest $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc $(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll $(BUILD_DIR)\php*.exe > NUL + +clean: clean-pecl + @echo Cleaning distribution build dirs + cd $(BUILD_DIR) + @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL + -@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL + !if "$(EXT_TARGETS)" == "" _EXTENSION_DLL=$(PECL_TARGETS) !else @@ -37,13 +37,13 @@ _EXTENSION_DLL=$(EXT_TARGETS) test: set-tmp-env "$(PHP_PREFIX)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(PHP_PREFIX)\php.exe" -d extension=$(BUILD_DIR)\$(_EXTENSION_DLL) -!if $(MT) == "" -_VC_MANIFEST_EMBED_EXE= -_VC_MANIFEST_EMBED_DLL= -!else -_VC_MANIFEST_EMBED_EXE= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;2 -!endif - -install: build-headers build-bins - +!if $(MT) == "" +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!else +_VC_MANIFEST_EMBED_EXE= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;2 +!endif + +install: build-headers build-bins +