Skip to content

Commit

Permalink
* Don't print the shared headers table after enabling each extension …
Browse files Browse the repository at this point in the history
…(cleaner configure output)

* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
  • Loading branch information
KalleZ committed Dec 13, 2010
1 parent 1f13d55 commit 15ee70e
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions win32/build/confutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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"), "\\");
Expand All @@ -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',''];
Expand All @@ -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
Expand Down

0 comments on commit 15ee70e

Please sign in to comment.