From ff02775331a670fd5484289fb1d34a18c449bb25 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 2 Feb 2018 18:30:20 +0100 Subject: [PATCH] Use 7za for packaging Better compression, Unicode support and general compatibility. --- win32/build/Makefile | 10 +++++----- win32/build/confutils.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/win32/build/Makefile b/win32/build/Makefile index 1412f8405d..124d7f239d 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -200,14 +200,14 @@ build-dist: $(BUILD_DIR)\deplister.exe -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 ..\$(DIST_ZIP_SNAP) . + -$(7ZA) a ..\$(DIST_ZIP_SNAP) . cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -$(ZIP) -9 -q -r ..\$(DIST_ZIP_PECL) . + -$(7ZA) a ..\$(DIST_ZIP_PECL) . cd $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING) - -$(ZIP) -9 -q -r ..\$(DIST_ZIP_TEST_PACK) . + -$(7ZA) a ..\$(DIST_ZIP_TEST_PACK) . cd $(BUILD_DIR) - -$(ZIP) -9 -q $(DIST_ZIP_DEBUG_PACK) *.pdb - -$(ZIP) -9 -q -r $(DIST_ZIP_DEV_PACK) $(BUILD_DIR_DEV_NAME) + -$(7ZA) a $(DIST_ZIP_DEBUG_PACK) *.pdb + -$(7ZA) a $(DIST_ZIP_DEV_PACK) $(BUILD_DIR_DEV_NAME) cd $(BUILD_DIR) dist: all build-dist diff --git a/win32/build/confutils.js b/win32/build/confutils.js index c15af50a51..ce3c3d109f 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2999,6 +2999,7 @@ function toolset_setup_project_tools() } PATH_PROG('zip'); PATH_PROG('lemon'); + PATH_PROG('7za'); // avoid picking up midnight commander from cygwin PATH_PROG('mc', WshShell.Environment("Process").Item("PATH")); -- 2.40.0