diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2009-01-02 12:18:21 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-01-02 12:18:21 +0000 |
| commit | 46dc120cdc478225eb02411fb7e40d40d81ea35d (patch) | |
| tree | e3589df06fa61e00afe2fe1c02d7a0e804e71dc5 | |
| parent | 7c12271a560e704f46e921ce14fe2ae9c52aa9b4 (diff) | |
| download | php-git-46dc120cdc478225eb02411fb7e40d40d81ea35d.tar.gz | |
MFH: Check if configure script was copied, and output an error if it wasn't
| -rw-r--r-- | buildconf.bat | 2 | ||||
| -rw-r--r-- | win32/build/buildconf.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/buildconf.bat b/buildconf.bat index aca8394d3c..27a4bcb2d1 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -3,3 +3,5 @@ cscript /nologo win32\build\buildconf.js %* SET PHP_BUILDCONF_PATH=%~dp0 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 'configure --help')
\ No newline at end of file diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index 4e052eab9f..925dd046bf 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.2.4 2008-07-20 02:20:31 sfox Exp $ */ +/* $Id: buildconf.js,v 1.13.2.2.2.1.2.5 2009-01-02 12:18:21 kalle Exp $ */ // This generates a configure script for win32 build WScript.StdOut.WriteLine("Rebuilding configure.js"); @@ -278,4 +278,3 @@ C.Write(file_get_contents("win32/build/configure.tail")); B.WriteLine("@echo off"); B.WriteLine("cscript /nologo configure.js %*"); -WScript.StdOut.WriteLine("Now run 'configure --help'"); |