sfox Wed Jul 9 08:15:46 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/win32/build DSP.README block.template.dsw projectgen.js
template.dsp template.dsw
Modified files:
/php-src/win32/build buildconf.js config.w32 confutils.js
Log:
- Embryonic project file generation. Use buildconf --add-project-files and
hopefully it'll work.
- Please read the README before complaining.
@Stas, Rob - please test.
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.13.2.2.2.1.2.2&r2=1.13.2.2.2.1.2.3&diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.2
php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.3
--- php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.2 Mon Jun 23 07:55:03 2008
+++ php-src/win32/build/buildconf.js Wed Jul 9 08:15:46 2008
@@ -16,13 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: buildconf.js,v 1.13.2.2.2.1.2.2 2008/06/23 07:55:03 pajoye Exp $ */
+/* $Id: buildconf.js,v 1.13.2.2.2.1.2.3 2008/07/09 08:15:46 sfox Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
var FSO = WScript.CreateObject("Scripting.FileSystemObject");
var C = FSO.CreateTextFile("configure.js", true);
var B = FSO.CreateTextFile("configure.bat", true);
+var DSP = false;
var modules = "";
var MODULES = WScript.CreateObject("Scripting.Dictionary");
@@ -203,6 +204,11 @@
WScript.StdOut.WriteLine("Adding " + argval + " to the
module search path");
module_dirs[module_dirs.length] = argval;
}
+
+ if (argname == '--add-project-files') {
+ WScript.StdOut.WriteLine("Adding dsp templates into the
mix");
+ DSP = true;
+ }
}
}
@@ -212,6 +218,16 @@
C.WriteLine("/* This file automatically generated from
win32/build/confutils.js */");
C.Write(file_get_contents("win32/build/confutils.js"));
+// If project files were requested, pull in the code to generate them
+if (DSP == true) {
+ C.WriteLine('PHP_DSP="yes"');
+ C.WriteBlankLines(1);
+ C.Write(file_get_contents("win32/build/projectgen.js"));
+} else {
+ C.WriteLine('PHP_DSP="no"');
+ C.WriteBlankLines(1);
+}
+
// Pull in code from sapi and extensions
modules = file_get_contents("win32/build/config.w32");
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.23&r2=1.40.2.8.2.10.2.24&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.23
php-src/win32/build/config.w32:1.40.2.8.2.10.2.24
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.23 Mon Jul 7 13:51:35 2008
+++ php-src/win32/build/config.w32 Wed Jul 9 08:15:46 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.23 2008/07/07 13:51:35 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.24 2008/07/09 08:15:46 sfox Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -364,3 +364,10 @@
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
+
+if (PHP_DSP != "no") {
+ if (FSO.FolderExists("tmp")) {
+ FSO.DeleteFolder("tmp");
+ }
+ FSO.CreateFolder("tmp");
+}
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.22&r2=1.60.2.1.2.8.2.23&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.22
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.23
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.22 Mon Jul 7 13:51:35 2008
+++ php-src/win32/build/confutils.js Wed Jul 9 08:15:46 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.22 2008/07/07 13:51:35 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.23 2008/07/09 08:15:46 sfox Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -26,6 +26,7 @@
var MFO = null;
var SYSTEM_DRIVE = WshShell.Environment("Process").Item("SystemDrive");
var PROGRAM_FILES = WshShell.Environment("Process").Item("ProgramFiles");
+var DSP_FLAGS = new Array();
/* Store the enabled extensions (summary + QA check) */
var extensions_enabled = new Array();
@@ -1039,6 +1040,10 @@
ADD_FLAG("SAPI_TARGETS", makefiletarget);
}
+ if (PHP_DSP != "no") {
+ generate_dsp_file(sapiname, configure_module_dirname,
file_list, false);
+ }
+
MFO.WriteBlankLines(1);
sapi_enabled[sapi_enabled.length] = [sapiname];
}
@@ -1203,6 +1208,11 @@
DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' +
EXT + ')');
}
ADD_FLAG("CFLAGS_" + EXT, cflags);
+
+ if (PHP_DSP != "no") {
+ generate_dsp_file(extname, configure_module_dirname, file_list,
shared);
+ }
+
extensions_enabled[extensions_enabled.length] = [extname, shared ?
'shared' : 'static'];
}
@@ -1449,10 +1459,20 @@
}
}
+ if (PHP_DSP != "no") {
+ generate_dsp_file("TSRM", "TSRM", null, false);
+ generate_dsp_file("Zend", "Zend", null, false);
+ generate_dsp_file("win32", "win32", null, false);
+ generate_dsp_file("main", "main", null, false);
+ generate_dsp_file("streams", "main\\streams", null, false);
+ generate_dsp_flags();
+ }
+
STDOUT.WriteLine("Generating files...");
generate_makefile();
generate_internal_functions();
generate_config_h();
+
STDOUT.WriteLine("Done.");
STDOUT.WriteBlankLines(1);
write_summary();
@@ -1577,6 +1597,12 @@
configure_subst.Remove(name);
}
configure_subst.Add(name, flags);
+
+ if (PHP_DSP != "no") {
+ if (flags && (name.substr(name.length-3) != "PHP") &&
(name.substr(0, 7) == "CFLAGS_")) {
+ DSP_FLAGS[DSP_FLAGS.length] = new Array(name, flags);
+ }
+ }
}
function get_define(name)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/DSP.README?view=markup&rev=1.1
Index: php-src/win32/build/DSP.README
+++ php-src/win32/build/DSP.README
http://cvs.php.net/viewvc.cgi/php-src/win32/build/block.template.dsw?view=markup&rev=1.1
Index: php-src/win32/build/block.template.dsw
+++ php-src/win32/build/block.template.dsw
http://cvs.php.net/viewvc.cgi/php-src/win32/build/projectgen.js?view=markup&rev=1.1
Index: php-src/win32/build/projectgen.js
+++ php-src/win32/build/projectgen.js
http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.dsp?view=markup&rev=1.1
Index: php-src/win32/build/template.dsp
+++ php-src/win32/build/template.dsp
http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.dsw?view=markup&rev=1.1
Index: php-src/win32/build/template.dsw
+++ php-src/win32/build/template.dsw
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
