pajoye Fri, 10 Dec 2010 16:10:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306189
Log:
- add initial PHP_INSTALL_HEADERS, one step closer to phpize
Changed paths:
U php/php-src/trunk/win32/build/config.w32
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/trunk/win32/build/config.w32
===================================================================
--- php/php-src/trunk/win32/build/config.w32 2010-12-10 14:35:37 UTC (rev
306188)
+++ php/php-src/trunk/win32/build/config.w32 2010-12-10 16:10:08 UTC (rev
306189)
@@ -107,7 +107,7 @@
}
ARG_ENABLE('zts', 'Thread safety', 'yes');
// Configures the hard-coded installation dir
-ARG_ENABLE('prefix', 'where PHP will be installed', '');
+ARG_WITH('prefix', 'where PHP will be installed', '');
if (PHP_PREFIX == '') {
PHP_PREFIX = "C:\\php";
if (PHP_DEBUG == "yes")
@@ -356,6 +356,8 @@
ADD_SOURCES("win32", "glob.c readdir.c \
registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
+PHP_INSTALL_HEADERS("Zend/ TSRM/ include/ main/ main/streams/");
+
STDOUT.WriteBlankLines(1);
/* Can we build with IPv6 support? */
Modified: php/php-src/trunk/win32/build/confutils.js
===================================================================
--- php/php-src/trunk/win32/build/confutils.js 2010-12-10 14:35:37 UTC (rev
306188)
+++ php/php-src/trunk/win32/build/confutils.js 2010-12-10 16:10:08 UTC (rev
306189)
@@ -34,6 +34,9 @@
/* Store the SAPI enabled (summary + QA check) */
var sapi_enabled = new Array();
+/* Store the headers to install */
+var headers_install = new Array();
+
/* Mapping CL version > human readable name */
var VC_VERSIONS = new Array();
VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
@@ -1848,7 +1851,27 @@
return items;
}
+function PHP_INSTALL_HEADERS(headers_list)
+{
+ headers_list = headers_list.split(new RegExp("\\s+"));
+ headers_list.sort();
+ for (i in headers_list) {
+ src = headers_list[i];
+ src = src.replace(new RegExp("/", "g"), "\\");
+ isdir = FSO.FolderExists(src);
+ isfile = FSO.FileExists(src);
+ if (isdir) {
+ headers_install[headers_install.length] = [src, 'dir'];
+ ADD_FLAG("INSTALL_HEADERS_DIR", src);
+ } else if (isfile) {
+ headers_install[headers_install.length] = [src, 'file'];
+ ADD_FLAG("INSTALL_HEADERS", src);
+ }
+ }
+ output_as_table(["Headers", "Type"], headers_install);
+}
+
// for snapshot builders, this option will attempt to enable everything
// and you can then build everything, ignoring fatal errors within a module
// by running "nmake snap"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
