summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-01-09 14:01:21 (GMT)
committerPierre Joye <pajoye@php.net>2011-01-09 14:01:21 (GMT)
commit7c6310852e51ac62785361df5f32e761919fbf98 (patch)
treecc9f6e2cc69644e0e64f498987612995aa6f3d77 /win32
parentb374b41c6f2f09ea6bbedf51fb97a99d6b5298fd (diff)
downloadphp-7c6310852e51ac62785361df5f32e761919fbf98.tar.gz
- let try to fix pecl header install so we can do the same than unix, install them in ext/<extname> instead of pecl<extname>
Diffstat (limited to 'win32')
-rw-r--r--win32/build/confutils.js21
1 files changed, 21 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 4cf61be..a4ea2bf 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1981,6 +1981,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
dir = dir.replace(new RegExp("/", "g"), "\\");
for (i in headers_list) {
+ found = false;
src = headers_list[i];
src = src.replace(new RegExp("/", "g"), "\\");
isdir = FSO.FolderExists(dir + src);
@@ -1991,11 +1992,31 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
}
headers_install[headers_install.length] = [dir + src, 'dir',''];
ADD_FLAG("INSTALL_HEADERS_DIR", dir + src);
+ found = true;
} else if (isfile) {
dirname = FSO.GetParentFolderName(dir + src);
headers_install[headers_install.length] = [dir + src, 'file', dirname];
ADD_FLAG("INSTALL_HEADERS", dir + src);
+ found = true;
} else {
+ path = configure_module_dirname + "\\"+ src;
+ isdir = FSO.FolderExists(path);
+ isfile = FSO.FileExists(path);
+ if (isdir) {
+ if (src.length > 0 && src.substr(src.length - 1) != '/' && src.substr(src.length - 1) != '\\') {
+ src += '\\';
+ }
+ headers_install[headers_install.length] = [path, 'dir',''];
+ ADD_FLAG("INSTALL_HEADERS_DIR", path);
+ } else if (isfile) {
+ dirname = FSO.GetParentFolderName(path);
+ headers_install[headers_install.length] = [path, 'file', dir];
+ ADD_FLAG("INSTALL_HEADERS", dir + src);
+ found = true;
+ }
+ }
+
+ if (found == false) {
STDOUT.WriteLine(headers_list);
ERROR("Cannot find header " + dir + src);
}