wez Fri Jan 9 10:11:32 2004 EDT Added files: /php-src/ext/informix config.w32
Modified files: /php-src/win32/build confutils.js Log: let informix build Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.36 php-src/win32/build/confutils.js:1.37 --- php-src/win32/build/confutils.js:1.36 Fri Jan 9 08:17:58 2004 +++ php-src/win32/build/confutils.js Fri Jan 9 10:11:19 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.36 2004/01/09 13:17:58 wez Exp $ +// $Id: confutils.js,v 1.37 2004/01/09 15:11:19 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -84,6 +84,20 @@ get_version_numbers(); +/* execute a command and return the output as a string */ +function execute(command_line) +{ + var e = WshShell.Exec(command_line); + var ret = ""; + + ret = e.StdOut.ReadAll(); + +//STDOUT.WriteLine("command " + command_line); +//STDOUT.WriteLine(ret); + + return ret; +} + function condense_path(path) { path = FSO.GetAbsolutePathName(path); Index: php-src/ext/informix/config.w32 +++ php-src/ext/informix/config.w32 // $Id: config.w32,v 1.1 2004/01/09 15:11:31 wez Exp $ // vim:ft=javascript ARG_WITH("informix", "informix support", "no"); if (PHP_INFORMIX != "no") { php_ifx_esql = PATH_PROG('esql', PHP_INFORMIX + ";\\ifx-client\\bin", 'IFX_ESQL'); if (php_ifx_esql) { php_ifx_libs = execute(php_ifx_esql + " -thread -libs"); php_ifx_libs = php_ifx_libs.replace("Libraries to be used:", "").replace(/^\s+/, ""); ADD_FLAG("LIBS_INFORMIX", php_ifx_libs); php_ifx_bin = FSO.GetParentFolderName(php_ifx_esql); php_ifx_dir = FSO.GetParentFolderName(php_ifx_bin); ADD_FLAG("CFLAGS_INFORMIX", "/I " + php_ifx_dir + "\\incl\\esql "); EXTENSION('informix', 'ifx.c', null, "/D IFX_VERSION=921 /D HAVE_IFX_IUS=1", "php_ifx.dll"); MFO.WriteLine(configure_module_dirname + "\\ifx.c: " + configure_module_dirname + "\\ifx.ec"); MFO.WriteLine("\t<<informix_build.bat"); MFO.WriteLine("PATH " + php_ifx_bin + ";%PATH%"); MFO.WriteLine("cd " + configure_module_dirname); MFO.WriteLine("$(IFX_ESQL) -dcmdl -p -G -subsystem:windows -EDHAVE_IFX_IUS -thread -I ..\\.. ifx.ec"); MFO.WriteLine("<<NOKEEP"); } else { WARNING("informix not enabled; could not find esql.exe"); } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php