cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

From: Date: Thu, 25 Dec 2008 00:08:51 +0000
Subject: cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-55103@lists.php.net to get a copy of this message
pajoye Thu Dec 25 00:08:51 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/build config.w32 confutils.js Log: - MFH: the config summary is a must, do not allow to disable it http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.37&r2=1.40.2.8.2.10.2.38&diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.37 php-src/win32/build/config.w32:1.40.2.8.2.10.2.38 --- php-src/win32/build/config.w32:1.40.2.8.2.10.2.37 Thu Dec 18 23:21:22 2008 +++ php-src/win32/build/config.w32 Thu Dec 25 00:08:51 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.40.2.8.2.10.2.37 2008/12/18 23:21:22 pajoye Exp $ +// $Id: config.w32,v 1.40.2.8.2.10.2.38 2008/12/25 00:08:51 pajoye Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -174,8 +174,8 @@ ADD_FLAG("LDFLAGS", "/incremental:no /debug /opt:ref,icf"); } // Equivalent to Release_TSInline build -> best optimization - ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG \ -/D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0"); + ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG /D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0"); + // if you have VS.Net /GS hardens the binary against buffer overruns // ADD_FLAG("CFLAGS", "/GS"); } @@ -370,8 +370,6 @@ DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE); -ARG_ENABLE('summary', 'Enable configuration summary', 'yes'); - if (PHP_DSP != "no") { if (FSO.FolderExists("tmp")) { FSO.DeleteFolder("tmp"); http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.31&r2=1.60.2.1.2.8.2.32&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.31 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.32 --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.31 Fri Nov 21 14:17:33 2008 +++ php-src/win32/build/confutils.js Thu Dec 25 00:08:51 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.31 2008/11/21 14:17:33 pajoye Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.32 2008/12/25 00:08:51 pajoye Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -1467,9 +1467,6 @@ function write_summary() { var ar = new Array(); - if (PHP_SUMMARY == "no") { - return; - } STDOUT.WriteBlankLines(2);

« previous php.cvs (#55103) next »