Skip to content

Commit b4a358b

Browse files
committed
Merge branch 'PHP-7.1'
* PHP-7.1: update NeWS update NEWS Enable 'nmake test' on building extensions Make phpize use PHP_PREFIX as the default location (windows)
2 parents abb228e + 30118e3 commit b4a358b

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

win32/build/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ build-lib: build-ext-libs
195195
build-devel: build-headers build-lib
196196
@if not exist $(BUILD_DIR_DEV)\script mkdir $(BUILD_DIR_DEV)\script >nul
197197
@if not exist $(BUILD_DIR_DEV)\build mkdir $(BUILD_DIR_DEV)\build >nul
198+
@copy run-tests.php $(BUILD_DIR_DEV)\script\ /y >nul
198199
@copy win32\build\confutils.js $(BUILD_DIR_DEV)\script\ /y >nul
199200
@copy win32\build\configure.tail $(BUILD_DIR_DEV)\script\ /y >nul
200201
@copy win32\build\config.w32.phpize.in $(BUILD_DIR_DEV)\script\ /y >nul

win32/build/Makefile.phpize

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ clean: clean-pecl
2828
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL
2929
-@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
3030

31+
!if "$(EXT_TARGETS)" == ""
32+
_EXTENSION_DLL=$(PECL_TARGETS)
33+
!else
34+
_EXTENSION_DLL=$(EXT_TARGETS)
35+
!endif
36+
37+
test:
38+
"$(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)
39+
3140
!if $(MT) == ""
3241
_VC_MANIFEST_EMBED_EXE=
3342
_VC_MANIFEST_EMBED_DLL=

win32/build/config.w32.phpize.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ DEFINE("BASE_INCLUDES", "/I " + PHP_DIR + "/include /I " + PHP_DIR + "/include/m
4040

4141
toolset_setup_common_cflags();
4242

43-
ARG_WITH('prefix', 'PHP installation prefix', '');
43+
ARG_WITH('prefix', 'PHP installation prefix', PHP_PREFIX);
4444
ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto');
4545
var PHP_MP_DISABLED = true;
4646
if (VS_TOOLSET && PHP_MP != 'disable') {

win32/build/phpize.js.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,3 +262,5 @@ C.Write(file_get_contents(PHP_DIR + "\\script\\configure.tail"));
262262

263263
B.WriteLine("@echo off");
264264
B.WriteLine("cscript /nologo configure.js %*");
265+
266+
FSO.CopyFile(PHP_DIR + "\\script\\run-tests.php", "run-tests.php", true);

0 commit comments

Comments
 (0)