kalle Sat Jan 3 03:27:47 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src buildconf.bat
/php-src/win32/build buildconf.js
Log:
MFH:
* Redirect the "1 file(s) copied" message to nul
* Check if configure script was copied, and output an error if it wasn't
http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.1.6.1&r2=1.1.6.2&diff_format=u
Index: php-src/buildconf.bat
diff -u php-src/buildconf.bat:1.1.6.1 php-src/buildconf.bat:1.1.6.2
--- php-src/buildconf.bat:1.1.6.1 Mon Dec 8 22:42:51 2008
+++ php-src/buildconf.bat Sat Jan 3 03:27:47 2009
@@ -1,5 +1,7 @@
@echo off
cscript /nologo win32\build\buildconf.js %*
SET PHP_BUILDCONF_PATH=%~dp0
-copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH%
+copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
SET PHP_SDK_SCRIPT_PATH=
+
+IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script,
configure script was not copied) ELSE (echo Now run 'cscript /nologo
configure.js --help')
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.13.2.2.2.1&r2=1.13.2.2.2.2&diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.13.2.2.2.1
php-src/win32/build/buildconf.js:1.13.2.2.2.2
--- php-src/win32/build/buildconf.js:1.13.2.2.2.1 Mon Jan 1 19:32:09 2007
+++ php-src/win32/build/buildconf.js Sat Jan 3 03:27:47 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: buildconf.js,v 1.13.2.2.2.1 2007/01/01 19:32:09 iliaa Exp $ */
+/* $Id: buildconf.js,v 1.13.2.2.2.2 2009/01/03 03:27:47 kalle Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -259,5 +259,3 @@
C.WriteBlankLines(1);
C.Write(file_get_contents("win32/build/configure.tail"));
-WScript.StdOut.WriteLine("Now run 'cscript /nologo configure.js --help'");
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
