- add VC version and architecture to the created zip(s) names

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 2b677fa3b390e88dac73e42f731a29fbb34f4e26..ded39bdfdf8afd332e7c107970a132ba265277b4 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -126,18 +126,18 @@ build-snap: 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)-Win32.zip
-       -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-       -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
+       -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+       -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+       -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
        $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(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 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
+       -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip .
        cd ..\..
        cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-       -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
+       -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip .
        cd ..\..
        cd $(BUILD_DIR)
-       -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+       -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb
        cd ..\..
 
 dist: all build-dist

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 133bbe14d58f4caeb09d9435702baf6384928a98..51569cf4bbae171128e66bbc4deaa10f2e6d305f 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -19,6 +19,7 @@ if (!CL) {
 VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
 STDOUT.WriteLine("  Detected compiler " + VC_VERSIONS[VCVERS]);
 AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
+DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
 
 // do we use x64 or 80x86 version of compiler?
 X64 = probe_binary(CL, 64);
@@ -28,6 +29,7 @@ if (X64) {
        STDOUT.WriteLine("  Detected 32-bit compiler");
 }
 AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture");
+DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86');
 
 // cygwin now ships with link.exe.  Avoid searching the cygwin path
 // for this, as we want the MS linker, not the fileutil

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 0c3d848b9aac1a51c9fefeb90e9ae4bb7d1b0fd1..fb5fb9d8e2adec96b25c6edd92998286bbcfb5df 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.79 2008-07-25 12:40:13 pajoye Exp $
+// $Id: confutils.js,v 1.80 2008-09-25 14:59:10 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -42,6 +42,13 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
 VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 
+var VC_VERSIONS_SHORT = new Array();
+VC_VERSIONS_SHORT[1200] = 'VC6';
+VC_VERSIONS_SHORT[1300] = 'VC7';
+VC_VERSIONS_SHORT[1310] = 'VC7.1';
+VC_VERSIONS_SHORT[1400] = 'VC8';
+VC_VERSIONS_SHORT[1500] = 'VC9';
+
 if (PROGRAM_FILES == null) {
        PROGRAM_FILES = "C:\\Program Files";
 }