com php-src: Merge branch 'PHP-7.2': win32/build/Makefile.phpize

From: Date: Mon, 07 Aug 2017 14:57:22 +0000
Subject: com php-src: Merge branch 'PHP-7.2': win32/build/Makefile.phpize
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98961@lists.php.net to get a copy of this message
Commit: ac1513ee4a33fcb7181d233c7b37953320e5116a Author: Anatol Belski <ab@php.net> Mon, 7 Aug 2017 16:57:22 +0200 Parents: f18a00b8ce30d9f3f96090c63d575b5d3557d9b5 d36344e88822d0019ddeb66c6929a93e8f88039b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ac1513ee4a33fcb7181d233c7b37953320e5116a Log: Merge branch 'PHP-7.2' * PHP-7.2: fix test target for phpize Changed paths: MM win32/build/Makefile.phpize Diff: diff --cc win32/build/Makefile.phpize index 24ec4da,ddd1a7b..67ba195 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@@ -28,15 -28,15 +28,15 @@@ clean: clean-pec @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 -_EXTENSION_DLL=$(EXT_TARGETS) -!endif - -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 "$(EXT_TARGETS)" == "" +_EXTENSION_DLL=$(PECL_TARGETS) +!else +_EXTENSION_DLL=$(EXT_TARGETS) +!endif + - test: set-test-env ++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=

« previous php.cvs (#98961) next »