From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sat, 3 Jan 2009 03:27:47 +0000 (+0000)
Subject: MFH:
X-Git-Tag: php-5.2.9RC1~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b47ae1bdb77f1729eda11eef75b553c8e571a062;p=php

MFH:
* Redirect the "1 file(s) copied" message to nul
* Check if configure script was copied, and output an error if it wasn't
---

diff --git a/buildconf.bat b/buildconf.bat
index 0b3b8ba7bc..16aa94d32c 100644
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -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
diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js
index a1b1331bf6..8d4cf59a3e 100644
--- a/win32/build/buildconf.js
+++ b/win32/build/buildconf.js
@@ -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.Write(modules);
 C.WriteBlankLines(1);
 C.Write(file_get_contents("win32/build/configure.tail"));
 
-WScript.StdOut.WriteLine("Now run 'cscript /nologo configure.js --help'");
-