[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js
pajoye Sun, 09 Jan 2011 14:01:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307302
Log:
- let try to fix pecl header install so we can do the same than unix, install
them in ext/extname instead of peclextname
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);
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js
pajoye Wed, 05 Jan 2011 00:59:31 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307100
Log:
- revert rev. 307044
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-05
00:35:39 UTC (rev 307099)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-05
00:59:31 UTC (rev 307100)
@@ -648,9 +648,6 @@
// Expand path to include general dirs
path_to_check += ; + php_usual_lib_suspects;
- // For static libs
- eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
-
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == yes ? Debug : (PHP_DEBUG_PACK
== yes?Release_Dbg:Release), lib, libs, libexec);
@@ -666,14 +663,6 @@
name = name.replace(rExp,_debug.lib);
libnames.unshift(name);
}
- } else if (!static_lib) {
- var length = libnames.length;
- for (var i = 0; i length; i++) {
- var name = new String(libnames[i]);
- rExp = /_a.lib$/i;
- name = name.replace(rExp,.lib);
- libnames.unshift(name);
- }
}
var i, j, k, libname;
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-05 00:35:39 UTC (rev
307099)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-05 00:59:31 UTC (rev
307100)
@@ -648,9 +648,6 @@
// Expand path to include general dirs
path_to_check += ; + php_usual_lib_suspects;
- // For static libs
- eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
-
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == yes ? Debug : (PHP_DEBUG_PACK
== yes?Release_Dbg:Release), lib, libs, libexec);
@@ -666,14 +663,6 @@
name = name.replace(rExp,_debug.lib);
libnames.unshift(name);
}
- } else if (!static_lib) {
- var length = libnames.length;
- for (var i = 0; i length; i++) {
- var name = new String(libnames[i]);
- rExp = /_a.lib$/i;
- name = name.replace(rExp,.lib);
- libnames.unshift(name);
- }
}
var i, j, k, libname;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js
kalleMon, 03 Jan 2011 23:08:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307044
Log:
Fixed linking of extensions that would use a static .lib file (libname_a.lib
rather than libname.lib)
# This fixes `configure --with-mcrypt=shared' to properly find and
# link against libmcrypt.lib rather than libmcrypt_a.lib
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-03
23:08:22 UTC (rev 307043)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-03
23:08:47 UTC (rev 307044)
@@ -648,6 +648,9 @@
// Expand path to include general dirs
path_to_check += ; + php_usual_lib_suspects;
+ // For static libs
+ eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
+
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == yes ? Debug : (PHP_DEBUG_PACK
== yes?Release_Dbg:Release), lib, libs, libexec);
@@ -663,6 +666,14 @@
name = name.replace(rExp,_debug.lib);
libnames.unshift(name);
}
+ } else if (!static_lib) {
+ var length = libnames.length;
+ for (var i = 0; i length; i++) {
+ var name = new String(libnames[i]);
+ rExp = /_a.lib$/i;
+ name = name.replace(rExp,.lib);
+ libnames.unshift(name);
+ }
}
var i, j, k, libname;
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-03 23:08:22 UTC (rev
307043)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-03 23:08:47 UTC (rev
307044)
@@ -648,6 +648,9 @@
// Expand path to include general dirs
path_to_check += ; + php_usual_lib_suspects;
+ // For static libs
+ eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
+
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == yes ? Debug : (PHP_DEBUG_PACK
== yes?Release_Dbg:Release), lib, libs, libexec);
@@ -663,6 +666,14 @@
name = name.replace(rExp,_debug.lib);
libnames.unshift(name);
}
+ } else if (!static_lib) {
+ var length = libnames.length;
+ for (var i = 0; i length; i++) {
+ var name = new String(libnames[i]);
+ rExp = /_a.lib$/i;
+ name = name.replace(rExp,.lib);
+ libnames.unshift(name);
+ }
}
var i, j, k, libname;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js
pajoye Sun, 02 Jan 2011 18:29:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=307000
Log:
- use the ext deps list for phpize's ADD_EXTENSION_DEP function
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-02
18:14:50 UTC (rev 306999)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:29:56 UTC (rev 307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR +
\\script\\ext_deps.js);
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval(PHP_ + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = PHP_ + extensions_enabled[i][0].toUpperCase() +
_SHARED= + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = PHP_ + extensions_enabled[i][0].toUpperCase() +
_SHARED= + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ;;
+ DEPS.WriteLine(PHP_ + extensions_enabled[i][0].toUpperCase()
+ =true;);
DEPS.WriteLine(out);
MF.WriteLine(out);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:14:50 UTC (rev
306999)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:29:56 UTC (rev
307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR +
\\script\\ext_deps.js);
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval(PHP_ + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = PHP_ + extensions_enabled[i][0].toUpperCase() +
_SHARED= + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = PHP_ + extensions_enabled[i][0].toUpperCase() +
_SHARED= + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ;;
+ DEPS.WriteLine(PHP_ + extensions_enabled[i][0].toUpperCase()
+ =true;);
DEPS.WriteLine(out);
MF.WriteLine(out);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
