cvs: php-src(PHP_5_2) /win32/build confutils.js
| From: | Edin Kadribasic | Date: | Sun, 07 May 2006 00:04:56 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /win32/build confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38045@lists.php.net to get a copy of this message | ||
edink Sun May 7 00:04:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/win32/build confutils.js
Log:
Enable separate build dir for SAPIs, the same way it is possible for EXTENSIONs
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1&r2=1.60.2.1.2.1&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1 php-src/win32/build/confutils.js:1.60.2.1.2.1
--- php-src/win32/build/confutils.js:1.60.2.1 Sun Jan 1 12:50:20 2006
+++ php-src/win32/build/confutils.js Sun May 7 00:04:56 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.60.2.1 2006/01/01 12:50:20 sniper Exp $
+// $Id: confutils.js,v 1.60.2.1.2.1 2006/05/07 00:04:56 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -871,14 +871,20 @@
return resname;
}
-function SAPI(sapiname, file_list, makefiletarget, cflags)
+function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
{
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
var ld = "@$(LD)";
- STDOUT.WriteLine("Enabling SAPI " + configure_module_dirname);
+ if (typeof(obj_dir) == "undefined") {
+ sapiname_for_printing = configure_module_dirname;
+ } else {
+ sapiname_for_printing = configure_module_dirname + " (via " + obj_dir + ")";
+ }
+
+ STDOUT.WriteLine("Enabling SAPI " + sapiname_for_printing);
MFO.WriteBlankLines(1);
MFO.WriteLine("# objects for SAPI " + sapiname);
@@ -888,7 +894,7 @@
ADD_FLAG('CFLAGS_' + SAPI, cflags);
}
- ADD_SOURCES(configure_module_dirname, file_list, sapiname);
+ ADD_SOURCES(configure_module_dirname, file_list, sapiname, obj_dir);
MFO.WriteBlankLines(1);
MFO.WriteLine("# SAPI " + sapiname);
MFO.WriteBlankLines(1);
@@ -897,7 +903,7 @@
resname = generate_version_info_resource(makefiletarget, configure_module_dirname);
MFO.WriteLine(makefiletarget + ": $(BUILD_DIR)\\" + makefiletarget);
- MFO.WriteLine("\t@echo SAPI " + configure_module_dirname + " build complete");
+ MFO.WriteLine("\t@echo SAPI " + sapiname_for_printing + " build complete");
MFO.WriteLine("$(BUILD_DIR)\\" + makefiletarget + ": $(DEPS_" + SAPI + ")
$(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname);
if (makefiletarget.match(new RegExp("\\.dll$"))) {