diff options
| author | Anatol Belski <ab@php.net> | 2017-02-24 19:41:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-02-24 19:41:30 +0100 |
| commit | 0ceedea2ccd39215b805c76a27ea857a1dc71222 (patch) | |
| tree | e602e4932842e80436a488a8407f04b4d8ada2b4 | |
| parent | 531fbb88f554346b080eb6b8fd7bc8e9d65707e5 (diff) | |
| parent | 9450e23b3288100c07f2990cd0bce962ca56461b (diff) | |
| download | php-git-0ceedea2ccd39215b805c76a27ea857a1dc71222.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Support run or test target invoked within debugger
| -rw-r--r-- | win32/build/Makefile | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 3293050b83..5389358787 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -29,6 +29,14 @@ MCFILE=$(BUILD_DIR)\wsyslog.rc BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE) BUILD_DIR_DEV=$(BUILD_DIR)\$(BUILD_DIR_DEV_NAME) +!if "$(DEBUGGER)" == "1" +DEBUGGER_CMD=devenv +DEBUGGER_ARGS=/debugexe +!else +DEBUGGER_CMD= +DEBUGGER_ARGS= +!endif + all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV) @@ -151,18 +159,19 @@ clean-pgo: clean-all -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip -del /f /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING).zip + !if $(PHP_TEST_INI_PATH) == "" test: set-tmp-env - "$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe" + $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe" run: set-tmp-env - "$(BUILD_DIR)\php.exe" $(ARGS) + $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" $(ARGS) !else test: set-tmp-env - "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS) + $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS) run: set-tmp-env - "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(ARGS) + $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(ARGS) !endif build-snap: set-tmp-env generated_files |