pajoye Sun, 09 Jan 2011 14:01:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307302
Log:
- let try to fix pecl header install so we can do the same than unix, install
them in ext/<extname> instead of pecl<extname>
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-09
12:08:05 UTC (rev 307301)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-09
14:01:21 UTC (rev 307302)
@@ -860,7 +860,8 @@
if (use_env == null) {
use_env = true;
}
-
+MESSAGE("******************" + path_to_check);
+MESSAGE("******************" + flag_name);
// if true, add the dir part of the header_name to the include path
if (add_dir_part == null) {
add_dir_part = false;
@@ -1981,6 +1982,7 @@
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 +1993,31 @@
}
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);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===================================================================
--- php/php-src/trunk/win32/build/confutils.js 2011-01-09 12:08:05 UTC (rev
307301)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-09 14:01:21 UTC (rev
307302)
@@ -1981,6 +1981,7 @@
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 @@
}
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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
