mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Don't print the shared headers table after enabling each extension (cleaner configure output)

Browse Source 
* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
This commit is contained in:
Kalle Sommer Nielsen 2010-12-13 20:46:57 +00:00
parent 1f13d55895
commit 15ee70e8e0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
win32/build/confutils.js
View File

@ -1475,6 +1475,11 @@ function write_summary()
STDOUT.WriteBlankLines(2);
STDOUT.WriteLine("Shared headers:");
output_as_table(["Headers", "Type", "target"], headers_install);
STDOUT.WriteBlankLines(2);
STDOUT.WriteLine("Enabled extensions:");
output_as_table(["Extension", "Mode"], extensions_enabled.sort());
STDOUT.WriteBlankLines(2);
@ -1867,7 +1872,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
{
headers_list = headers_list.split(new RegExp("\\s+"));
headers_list.sort();
if (dir.length > 0 && dir.substr(dir.length - 1) != '/') {
if (dir.length > 0 && dir.substr(dir.length - 1) != '/' && dir.substr(dir.length - 1) != '\\') {
dir += '/';
}
dir = dir.replace(new RegExp("/", "g"), "\\");
@ -1878,7 +1883,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
isdir = FSO.FolderExists(dir + src);
isfile = FSO.FileExists(dir + src);
if (isdir) {
if (src.length > 0 && src.substr(src.length - 1) != '/') {
if (src.length > 0 && src.substr(src.length - 1) != '/' && src.substr(src.length - 1) != '\\') {
src += '\\';
}
headers_install[headers_install.length] = [dir + src, 'dir',''];
@ -1892,7 +1897,6 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
ERROR("Cannot find header " + dir + src);
}
}
output_as_table(["Headers", "Type", "target"], headers_install);
}
// for snapshot builders, this option will attempt to enable everything