pajoye Thu Sep 25 14:59:10 2008 UTC Modified files: /php-src/win32/build Makefile config.w32 confutils.js Log: - add VC version and architecture to the created zip(s) names http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.48&r2=1.49&diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.48 php-src/win32/build/Makefile:1.49 --- php-src/win32/build/Makefile:1.48 Mon Jul 21 09:56:37 2008 +++ php-src/win32/build/Makefile Thu Sep 25 14:59:10 2008 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.48 2008/07/21 09:56:37 sfox Exp $ +# $Id: Makefile,v 1.49 2008/09/25 14:59:10 pajoye Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -126,18 +126,18 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.85&r2=1.86&diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.85 php-src/win32/build/config.w32:1.86 --- php-src/win32/build/config.w32:1.85 Sat Aug 23 19:50:36 2008 +++ php-src/win32/build/config.w32 Thu Sep 25 14:59:10 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.85 2008/08/23 19:50:36 pajoye Exp $ +// $Id: config.w32,v 1.86 2008/09/25 14:59:10 pajoye Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -19,6 +19,7 @@ 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 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.79&r2=1.80&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.79 php-src/win32/build/confutils.js:1.80 --- php-src/win32/build/confutils.js:1.79 Fri Jul 25 12:40:13 2008 +++ php-src/win32/build/confutils.js Thu Sep 25 14:59:10 2008 @@ -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[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"; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php