Pass explicit PHP version string to mkdist.php

diff --git a/win32/build/Makefile b/win32/build/Makefile
index cb2e95a16b3a500244ab7486852742f222691926..dcc2c02b9ebc5d6a6c0125042a6901f26e662127 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -186,7 +186,7 @@ build-dist: $(BUILD_DIR)\deplister.exe
        -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
-       $(PHP_SDK_PHP_CMD) -d date.timezone=UTC -n -dphar.readonly=0 win32/build/mkdist.php "$(BUILD_DIR)" "$(PHP_BUILD)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
+       $(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 .
        cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)

diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index ca99b0dba9cadea8004d4c3195690c2a808d8f6d..f97c49c941fba8db10caf19625efbcb207fb9a1b 100644 (file)
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -1,21 +1,22 @@
 <?php # $Id$
 /* piece together a windows binary distro */
 
-$build_dir = $argv[1];
-$php_build_dir = $argv[2];
-$phpdll = $argv[3];
-$sapi_targets = explode(" ", $argv[4]);
-$ext_targets = explode(" ", $argv[5]);
-$pecl_targets = explode(" ", $argv[6]);
-$snapshot_template = $argv[7];
+$php_version = $argv[1];
+$build_dir = $argv[2];
+$php_build_dir = $argv[3];
+$phpdll = $argv[4];
+$sapi_targets = explode(" ", $argv[5]);
+$ext_targets = explode(" ", $argv[6]);
+$pecl_targets = explode(" ", $argv[7]);
+$snapshot_template = $argv[8];
 
 $is_debug = preg_match("/^debug/i", $build_dir);
 
 echo "Making dist for $build_dir\n";
 
-$dist_dir = $build_dir . "/php-" . phpversion();
-$test_dir = $build_dir . "/php-test-pack-" . phpversion();
-$pecl_dir = $build_dir . "/pecl-" . phpversion();
+$dist_dir = $build_dir . "/php-" . $php_version;
+$test_dir = $build_dir . "/php-test-pack-" . $php_version;
+$pecl_dir = $build_dir . "/pecl-" . $php_version;
 
 @mkdir($dist_dir);
 @mkdir("$dist_dir/ext");
@@ -258,12 +259,11 @@ foreach ($general_files as $src => $dest) {
 $branch = "HEAD"; // TODO - determine this from SVN branche name
 $fp = fopen("$dist_dir/snapshot.txt", "w");
 $now = date("r");
-$version = phpversion();
 fwrite($fp, <<<EOT
 This snapshot was automatically generated on
 $now
 
-Version: $version
+Version: $php_version
 Branch: $branch
 Build: $build_dir