com php-src: parametrize zip names: win32/build/Makefile

Commit: 2b37da9eda1e91ddb5ac6ff6f8862af2cae44f2a Author: Anatol Belski <ab@php.net> Tue, 11 Jul 2017 21:41:34 +0200 Parents: 8a287c0ea0c437c32f30bfc6a411b967c4b8aafb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b37da9eda1e91ddb5ac6ff6f8862af2cae44f2a Log: parametrize zip names simplify names Changed paths: M win32/build/Makefile Diff: diff --git a/win32/build/Makefile b/win32/build/Makefile index dcc2c02..aa8f783 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -29,6 +29,12 @@ 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) +DIST_ZIP_SNAP=php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip +DIST_ZIP_PECL=pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip +DIST_ZIP_DEV_PACK=php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip +DIST_ZIP_TEST_PACK=php-test-pack-$(PHP_VERSION_STRING).zip +DIST_ZIP_DEBUG_PACK=php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip + !if "$(DEBUGGER)" == "1" DEBUGGER_CMD=devenv DEBUGGER_ARGS=/debugexe @@ -154,10 +160,10 @@ clean-pgo: clean-all -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) -rd /s /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING) - -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip - -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip - -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 + -del /f /q $(BUILD_DIR)\$(DIST_ZIP_SNAP) + -del /f /q $(BUILD_DIR)\$(DIST_ZIP_DEBUG_PACK) + -del /f /q $(BUILD_DIR)\$(DIST_ZIP_PECL) + -del /f /q $(BUILD_DIR)\$(DIST_ZIP_TEST_PACK) !if $(PHP_TEST_INI_PATH) == "" @@ -183,19 +189,19 @@ build-snap: set-tmp-env generated_files build-dist: $(BUILD_DIR)\deplister.exe -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip - -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip - -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)\$(DIST_ZIP_SNAP) + -del /f /q $(BUILD_DIR)\$(DIST_ZIP_DEBUG_PACK) + -del /f /q $(BUILD_DIR)\$(DIST_ZIP_PECL) $(PHP_SDK_PHP_CMD) -d date.timezone=UTC -n -dphar.readonly=0 win32/build/mkdist.php "$(PHP_VERSION_STRING)" "$(BUILD_DIR)" "$(PHP_BUILD)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)" cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING) - -$(ZIP) -9 -q -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -q -r ..\$(DIST_ZIP_SNAP) . cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -$(ZIP) -9 -q -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -q -r ..\$(DIST_ZIP_PECL) . cd $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING) - -$(ZIP) -9 -q -r ..\php-test-pack-$(PHP_VERSION_STRING).zip . + -$(ZIP) -9 -q -r ..\$(DIST_ZIP_TEST_PACK) . cd $(BUILD_DIR) - -$(ZIP) -9 -q php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb - -$(ZIP) -9 -q -r php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip $(BUILD_DIR_DEV_NAME) + -$(ZIP) -9 -q $(DIST_ZIP_DEBUG_PACK) *.pdb + -$(ZIP) -9 -q -r $(DIST_ZIP_DEV_PACK) $(BUILD_DIR_DEV_NAME) cd $(BUILD_DIR) dist: all build-dist