diff options
| author | Pierre Joye <pajoye@php.net> | 2008-09-25 15:00:59 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-09-25 15:00:59 +0000 |
| commit | 1b5a8cc2588a04456046a422d493397c81adf932 (patch) | |
| tree | 5f35a71dba359f3fa15a73a866450ff87cf92b99 | |
| parent | 310f4583a431882f02d79ecc4f0f11c3bfe01f3d (diff) | |
| download | php-git-1b5a8cc2588a04456046a422d493397c81adf932.tar.gz | |
- MFH: add VC version and architecture to the created zip(s) names
| -rw-r--r-- | win32/build/Makefile | 12 | ||||
| -rw-r--r-- | win32/build/config.w32 | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 9 |
3 files changed, 16 insertions, 7 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 729fc25db6..6f452485c5 100644 --- 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 54b940049c..a4e6e6b236 100644 --- 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 7c7b9eb98a..d23d2b1adb 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.29 2008-07-25 12:40:45 pajoye Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.30 2008-09-25 15:00:59 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"; } |