wez Wed Dec 3 13:31:05 2003 EDT
Modified files:
/php-src/win32/build Makefile config.w32 confutils.js
Log:
VC stores lib path in LIB not LIBS.
Add --with-extra-includes and --with-extra-libs to be able to specify
general additions to those paths from the environment.
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.4 php-src/win32/build/Makefile:1.5
--- php-src/win32/build/Makefile:1.4 Wed Dec 3 11:51:23 2003
+++ php-src/win32/build/Makefile Wed Dec 3 13:31:04 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.4 2003/12/03 16:51:23 wez Exp $
+# $Id: Makefile,v 1.5 2003/12/03 18:31:04 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -60,7 +60,7 @@
del /F /Q $(BUILD_DIR)\*.*
test:
- %COMSPEC% /c <<test_suite_uses_lame_env_vars.bat
+ <<test_suite_uses_lame_env_vars.bat
set TEST_PHP_EXECUTABLE=$(BUILD_DIR)\\php.exe
$(BUILD_DIR)\\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0
run-tests.php $(TESTS)
<<NOKEEP
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.6 php-src/win32/build/config.w32:1.7
--- php-src/win32/build/config.w32:1.6 Wed Dec 3 09:29:45 2003
+++ php-src/win32/build/config.w32 Wed Dec 3 13:31:04 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.6 2003/12/03 14:29:45 wez Exp $
+// $Id: config.w32,v 1.7 2003/12/03 18:31:04 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -88,6 +88,9 @@
// that we need
ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source
dir (..\\php_build) if not specified', 'no');
+ARG_WITH('extra-includes', 'Extra include path to use when building everything', '');
+ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');
+
var php_usual_include_suspects =
"..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32";
var php_usual_lib_suspects = "..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32";
@@ -111,7 +114,29 @@
}
}
+function add_extra_dirs()
+{
+ var path, i, f;
+
+ path = PHP_EXTRA_INCLUDES.split(';');
+ for (i = 0; i < path.length; i++) {
+ f = FSO.GetAbsolutePathName(path[i]);
+ if (FSO.FolderExists(f)) {
+ ADD_FLAG("CFLAGS", '/I "' + f + '" ');
+ }
+ }
+ path = PHP_EXTRA_LIBS.split(';');
+ for (i = 0; i < path.length; i++) {
+ f = FSO.GetAbsolutePathName(path[i]);
+ if (FSO.FolderExists(f)) {
+ ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
+ }
+ }
+
+}
+
probe_basic_headers();
+add_extra_dirs();
//DEFINE("PHP_BUILD", PHP_PHP_BUILD);
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.7 php-src/win32/build/confutils.js:1.8
--- php-src/win32/build/confutils.js:1.7 Wed Dec 3 12:04:30 2003
+++ php-src/win32/build/confutils.js Wed Dec 3 13:31:04 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.7 2003/12/03 17:04:30 wez Exp $
+// $Id: confutils.js,v 1.8 2003/12/03 18:31:04 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -352,7 +352,7 @@
path_to_check += ";" + php_usual_lib_suspects;
}
- var p = search_paths(libname, path_to_check, "LIBS");
+ var p = search_paths(libname, path_to_check, "LIB");
var have = 0;
if (typeof(p) == "string") {
@@ -605,6 +605,11 @@
dir = get_define("BUILD_DIR");
build_dirs.sort();
last = null;
+
+ if (!FSO.FolderExists(dir)) {
+ FSO.CreateFolder(dir);
+ }
+
for (i = 0; i < build_dirs.length; i++) {
bd = FSO.BuildPath(dir, build_dirs[i]);
if (bd == last) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
