[PHP-CVS] cvs: php-src /win32/build confutils.js
kalle Fri May 29 07:41:46 2009 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
If we don't have a comment (for the 3rd argument in ARG_[ENABLE|WITH], then
don't print a comment say undefined
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.82r2=1.83diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.82
php-src/win32/build/confutils.js:1.83
--- php-src/win32/build/confutils.js:1.82 Thu Dec 25 00:03:39 2008
+++ php-src/win32/build/confutils.jsFri May 29 07:41:46 2009
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.82 2008/12/25 00:03:39 pajoye Exp $
+// $Id: confutils.js,v 1.83 2009/05/29 07:41:46 kalle Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1563,9 +1563,13 @@
for (i in keys) {
item = configure_hdr.Item(keys[i]);
outfile.WriteBlankLines(1);
- outfile.WriteLine(/* + item[1] + */);
pieces = item[0];
+ if (item[1] != undefined) {
+ outfile.WriteLine(/* + item[1] + */);
+ }
+
+
if (typeof(pieces) == string pieces.charCodeAt(0) == 34) {
/* quoted string have a maximal length of 2k under vc.
* solution is to crack them and let the compiler concat
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Fri Nov 21 14:03:23 2008 UTC Modified files: /php-src/win32/buildconfutils.js Log: - add build type (debug/release) and TS info to the summary http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.80r2=1.81diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.80 php-src/win32/build/confutils.js:1.81 --- php-src/win32/build/confutils.js:1.80 Thu Sep 25 14:59:10 2008 +++ php-src/win32/build/confutils.jsFri Nov 21 14:03:23 2008 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.80 2008/09/25 14:59:10 pajoye Exp $ +// $Id: confutils.js,v 1.81 2008/11/21 14:03:23 pajoye Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -1476,8 +1476,10 @@ output_as_table([Sapi Name], sapi_enabled); STDOUT.WriteBlankLines(2); - ar[0] = ['Compiler', VC_VERSIONS[VCVERS]]; - ar[1] = ['Architecture', X64 ? 'x64' : 'x86']; + ar[0] = ['Build type', PHP_DEBUG == yes ? Debug : Release]; + ar[1] = ['Thread Safety', PHP_ZTS == yes ? Yes : No]; + ar[2] = ['Compiler', VC_VERSIONS[VCVERS]]; + ar[3] = ['Architecture', X64 ? 'x64' : 'x86']; output_as_table([,], ar); STDOUT.WriteBlankLines(2); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Fri Jul 25 12:40:13 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- fix EXT_FOO_SHARED usage as dep mgt broke it (one more hack but we can
clean them after alpha)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.78r2=1.79diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.78
php-src/win32/build/confutils.js:1.79
--- php-src/win32/build/confutils.js:1.78 Mon Jul 21 17:00:34 2008
+++ php-src/win32/build/confutils.jsFri Jul 25 12:40:13 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.78 2008/07/21 17:00:34 pajoye Exp $
+// $Id: confutils.js,v 1.79 2008/07/25 12:40:13 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1150,10 +1150,13 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+
if (shared == null) {
eval(shared = PHP_ + EXT + _SHARED;);
+ } else {
+ eval(PHP_ + EXT + _SHARED = shared;);
}
+
if (cflags == null) {
cflags = ;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build confutils.js
Hi Pierre,
AC_DEFINE hasn't been called at that stage, so the call to
configure_hdr.Remove does nothing. That's why there's a need to work around
it.
- Steph
- Original Message -
From: Pierre-Alain Joye [EMAIL PROTECTED]
To: php-cvs@lists.php.net
Sent: Monday, July 21, 2008 6:00 PM
Subject: [PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Mon Jul 21 17:00:34 2008 UTC
Modified files:
/php-src/win32/build confutils.js
Log:
- MFB: sync changes with 5.3...
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.77r2=1.78diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.77
php-src/win32/build/confutils.js:1.78
--- php-src/win32/build/confutils.js:1.77 Mon Jul 21 09:56:37 2008
+++ php-src/win32/build/confutils.js Mon Jul 21 17:00:34 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.77 2008/07/21 09:56:37 sfox Exp $
+// $Id: confutils.js,v 1.78 2008/07/21 17:00:34 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1123,17 +1123,23 @@
if (ext_shared) {
WARNING(extname + cannot be built: missing dependency, + dependson +
not found);
- var dllname = ' php_' + extname + '.dll';
+ if (configure_hdr.Exists('HAVE_' + EXT)) {
+ configure_hdr.Remove('HAVE_' + EXT);
+ }
+
+ dllname = ' php_' + extname + '.dll';
if (!REMOVE_TARGET(dllname, 'EXT_TARGETS')) {
REMOVE_TARGET(dllname, 'PECL_TARGETS');
}
+ extensions_enabled.pop();
return false;
- }
- ERROR(Cannot build + extname + ; + dependson + not enabled);
- return false;
+ } else {
+ ERROR(Cannot build + extname + ; + dependson + not enabled);
+ return false;
+ }
}
} // dependency is statically built-in to PHP
return true;
@@ -1325,22 +1331,12 @@
function REMOVE_TARGET(dllname, flag)
{
- var dllname = dllname.replace(/\s/g, );
- var EXT = dllname.replace(/php_(\S+)\.dll/, $1).toUpperCase();
- var php_flags = configure_subst.Item(CFLAGS_PHP);
-
if (configure_subst.Exists(flag)) {
- var targets = configure_subst.Item(flag);
-
+ targets = configure_subst.Item(flag);
if (targets.match(dllname)) {
configure_subst.Remove(flag);
targets = targets.replace(dllname, );
- targets = targets.replace(/\s+/, );
- targets = targets.replace(/\s$/, );
configure_subst.Add(flag, targets);
- configure_hdr.Add(HAVE_ + EXT, new Array(0, ));
- configure_subst.Item(CFLAGS_PHP) = php_flags.replace( /D COMPILE_DL_
+ EXT, );
- extensions_enabled.pop();
return true;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Mon Jul 21 17:00:34 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- MFB: sync changes with 5.3...
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.77r2=1.78diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.77
php-src/win32/build/confutils.js:1.78
--- php-src/win32/build/confutils.js:1.77 Mon Jul 21 09:56:37 2008
+++ php-src/win32/build/confutils.jsMon Jul 21 17:00:34 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.77 2008/07/21 09:56:37 sfox Exp $
+// $Id: confutils.js,v 1.78 2008/07/21 17:00:34 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1123,17 +1123,23 @@
if (ext_shared) {
WARNING(extname + cannot be built: missing
dependency, + dependson + not found);
- var dllname = ' php_' + extname + '.dll';
+ if (configure_hdr.Exists('HAVE_' + EXT)) {
+ configure_hdr.Remove('HAVE_' + EXT);
+ }
+
+ dllname = ' php_' + extname + '.dll';
if (!REMOVE_TARGET(dllname, 'EXT_TARGETS')) {
REMOVE_TARGET(dllname, 'PECL_TARGETS');
}
+ extensions_enabled.pop();
return false;
- }
- ERROR(Cannot build + extname + ; + dependson +
not enabled);
- return false;
+ } else {
+ ERROR(Cannot build + extname + ; +
dependson + not enabled);
+ return false;
+ }
}
} // dependency is statically built-in to PHP
return true;
@@ -1325,22 +1331,12 @@
function REMOVE_TARGET(dllname, flag)
{
- var dllname = dllname.replace(/\s/g, );
- var EXT = dllname.replace(/php_(\S+)\.dll/, $1).toUpperCase();
- var php_flags = configure_subst.Item(CFLAGS_PHP);
-
if (configure_subst.Exists(flag)) {
- var targets = configure_subst.Item(flag);
-
+ targets = configure_subst.Item(flag);
if (targets.match(dllname)) {
configure_subst.Remove(flag);
targets = targets.replace(dllname, );
- targets = targets.replace(/\s+/, );
- targets = targets.replace(/\s$/, );
configure_subst.Add(flag, targets);
- configure_hdr.Add(HAVE_ + EXT, new Array(0, ));
- configure_subst.Item(CFLAGS_PHP) =
php_flags.replace( /D COMPILE_DL_ + EXT, );
- extensions_enabled.pop();
return true;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Wed Jul 2 20:54:10 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- MFB: Add summary info
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.73r2=1.74diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.73
php-src/win32/build/confutils.js:1.74
--- php-src/win32/build/confutils.js:1.73 Wed May 14 03:32:27 2008
+++ php-src/win32/build/confutils.jsWed Jul 2 20:54:10 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.73 2008/05/14 03:32:27 auroraeosrose Exp $
+// $Id: confutils.js,v 1.74 2008/07/02 20:54:10 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -27,6 +27,19 @@
var SYSTEM_DRIVE = WshShell.Environment(Process).Item(SystemDrive);
var PROGRAM_FILES = WshShell.Environment(Process).Item(ProgramFiles);
+var extensions_enabled = new Array();
+var sapi_enabled = new Array();
+
+// 12 is VC6
+// 13 is vs.net 2003
+// 14 is vs.net 2005
+// 15 is vs.net 2008
+var VC_VERSIONS = new Array();
+VC_VERSIONS[12] = 'VC6';
+VC_VERSIONS[13] = 'Visual C++ 2003';
+VC_VERSIONS[14] = 'Visual C++ 2005';
+VC_VERSIONS[15] = 'Visual C++ 2008';
+
if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
}
@@ -416,7 +429,11 @@
}
}
if (force) {
- argval = no;
+ if (arg.defval == '') {
+ argval = '';
+ } else {
+ argval = no;
+ }
shared = false;
}
}
@@ -1001,6 +1018,7 @@
}
MFO.WriteBlankLines(1);
+ sapi_enabled[sapi_enabled.length] = [sapiname];
}
function ADD_DIST_FILE(filename)
@@ -1045,7 +1063,7 @@
if (optional) {
if (dep_present == no)
- return;
+ return false;
}
var ext_shared = eval(PHP_ + EXT + _SHARED);
@@ -1053,7 +1071,7 @@
if (dep_shared) {
if (!ext_shared) {
if (optional) {
- return;
+ return false;
}
ERROR(static + extname + cannot depend on shared
+ dependson);
}
@@ -1064,11 +1082,14 @@
if (dep_present == no) {
if (ext_shared) {
WARNING(extname + has a missing dependency:
+ dependson);
+ return false;
} else {
ERROR(Cannot build + extname + ; +
dependson + not enabled);
+ return false;
}
}
- } // dependency is statically built-in to PHP
+ } // dependency is statically built-in to PHP
+ return true;
}
function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
@@ -1160,6 +1181,7 @@
DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' +
EXT + ')');
}
ADD_FLAG(CFLAGS_ + EXT, cflags);
+ extensions_enabled[extensions_enabled.length] = [extname, shared ?
'shared' : 'static'];
}
function ADD_SOURCES(dir, file_list, target, obj_dir)
@@ -1277,6 +1299,104 @@
outfile.Close();
}
+function output_as_table(header, ar_out)
+{
+ var l = header.length;
+ var cols = 80;
+ var fixedlenght = ;
+ var t = 0;
+ var i,j,k,m;
+ var out = | ;
+ var min = new Array(l);
+ var max = new Array(l);
+
+ if (l != ar_out[0].length) {
+ STDOUT.WriteLine(Invalid header argument, can't output the
table + l + + ar_out[0].length );
+ return;
+ }
+ for (j=0; j l; j++) {
+ var tmax, tmin;
+
+ /*Figure out the max length per column */
+ tmin = 0;
+ tmax = 0;
+ for (k = 0; k ar_out.length; k++) {
+ var t = ar_out[k][j].length;
+ if (t tmax) tmax = t;
+ else if (t tmin) tmin = t;
+ }
+ if (tmax header[j].length) {
+ max[j] = tmax;
+ } else {
+ max[j] = header[j].length;
+ }
+ if (tmin header[j].length) {
+ min[j] = header[j].length;
+ }
+ }
+
+ sep = ;
+ k = 0;
+ for (i = 0; i l; i++) {
+ k += max[i] + 3;
+ }
+ k++;
+
+ for (j=0; j k; j++) {
+ sep += -;
+ }
+
+
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Sun Feb 17 01:29:17 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- MFB: add PHP_PHP_BUILD\bin to the path in PATH_PROG (option set with
--with-php-builds=[PATH] the zip.zip contains all we need (except re2c! )
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.71r2=1.72diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.71
php-src/win32/build/confutils.js:1.72
--- php-src/win32/build/confutils.js:1.71 Thu Jan 10 18:21:23 2008
+++ php-src/win32/build/confutils.jsSun Feb 17 01:29:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.71 2008/01/10 18:21:23 rrichards Exp $
+// $Id: confutils.js,v 1.72 2008/02/17 01:29:16 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -501,6 +501,7 @@
var exe;
var place;
var cyg_path = PHP_CYGWIN + \\bin; + PHP_CYGWIN + \\usr\\local\\bin;
+ var php_build_bin_path = PHP_PHP_BUILD + \\bin
exe = progname + .exe;
@@ -510,6 +511,8 @@
additional_paths += ; + cyg_path;
}
+ additional_paths = additional_paths + ; + php_build_bin_path;
+
place = search_paths(exe, additional_paths, PATH);
if (place == true) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
rrichards Thu Jan 10 18:21:24 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
add errors when missing dependencies (Steph)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.70r2=1.71diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.70
php-src/win32/build/confutils.js:1.71
--- php-src/win32/build/confutils.js:1.70 Wed Nov 14 19:44:24 2007
+++ php-src/win32/build/confutils.jsThu Jan 10 18:21:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.70 2007/11/14 19:44:24 auroraeosrose Exp $
+// $Id: confutils.js,v 1.71 2008/01/10 18:21:23 rrichards Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1009,7 +1009,15 @@
ADD_FLAG(LDFLAGS_ + EXT, /libpath:$(BUILD_DIR));
ADD_FLAG(LIBS_ + EXT, php_ + dependson + .lib);
ADD_FLAG(DEPS_ + EXT, $(BUILD_DIR)\\php_ + dependson +
.lib);
- }
+ } else {
+ if (dep_present == no) {
+ if (ext_shared) {
+ WARNING(extname + has a missing dependency:
+ dependson);
+ } else {
+ ERROR(Cannot build + extname + ; +
dependson + not enabled);
+ }
+ }
+ } // dependency is statically built-in to PHP
}
function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
auroraeosrose Wed Nov 14 19:44:24 2007 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.69r2=1.70diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.69
php-src/win32/build/confutils.js:1.70
--- php-src/win32/build/confutils.js:1.69 Thu Jul 26 22:45:22 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:44:24 2007
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.69 2007/07/26 22:45:22 jani Exp $
+// $Id: confutils.js,v 1.70 2007/11/14 19:44:24 auroraeosrose Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
STDOUT.WriteLine(Saving configure options to config.nice.bat);
var nicefile = FSO.CreateTextFile(config.nice.bat, true);
- nicefile.WriteLine(nice);
+ nicefile.WriteLine(nice + %*);
nicefile.Close();
AC_DEFINE('CONFIGURE_COMMAND', nice);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
derick Sat Jul 21 11:24:36 2007 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- Allow the use of a user defined template.rc file to override the
default ones. This makes it possible to include the extension's version
inside the version properties of the generated extension DLL instead
of the PHP version the extension is build against.
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.67r2=1.68diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.67
php-src/win32/build/confutils.js:1.68
--- php-src/win32/build/confutils.js:1.67 Mon Mar 19 03:16:18 2007
+++ php-src/win32/build/confutils.jsSat Jul 21 11:24:36 2007
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.67 2007/03/19 03:16:18 edink Exp $
+// $Id: confutils.js,v 1.68 2007/07/21 11:24:36 derick Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -860,7 +860,19 @@
if (makefiletarget.match(new RegExp(\\.exe$))) {
logo = /D WANT_LOGO ;
}
-
+
+ /**
+* Use user supplied template.rc if it exists
+*/
+ if (FSO.FileExists(creditspath + '\\template.rc')) {
+ MFO.WriteLine($(BUILD_DIR)\\ + resname + : + creditspath +
\\template.rc);
+ MFO.WriteLine(\t$(RC) /fo $(BUILD_DIR)\\ + resname + logo +
+ ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d
FILE_NAME=\\' + makefiletarget +
+ '\\ /d PRODUCT_NAME=\\' + res_prod_name + '\\ /d
THANKS_GUYS=\\' +
+ thanks + '\\ ' + creditspath + '\\template.rc');
+ return resname;
+ }
+
MFO.WriteLine($(BUILD_DIR)\\ + resname + :
win32\\build\\template.rc);
MFO.WriteLine(\t$(RC) /fo $(BUILD_DIR)\\ + resname + logo +
' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d
FILE_NAME=\\' + makefiletarget +
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
edink Mon Mar 19 03:16:18 2007 UTC Modified files: /php-src/win32/buildconfutils.js Log: MFB: Make DLL only once (Wez) http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.66r2=1.67diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.66 php-src/win32/build/confutils.js:1.67 --- php-src/win32/build/confutils.js:1.66 Mon Jan 29 04:40:46 2007 +++ php-src/win32/build/confutils.jsMon Mar 19 03:16:18 2007 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.66 2007/01/29 04:40:46 iliaa Exp $ +// $Id: confutils.js,v 1.67 2007/03/19 03:16:18 edink Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -1045,7 +1045,9 @@ var resname = generate_version_info_resource(dllname, configure_module_dirname); var ld = @$(CC); - MFO.WriteLine($(BUILD_DIR)\\ + dllname + $(BUILD_DIR)\\ + libname + : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname); + MFO.WriteLine($(BUILD_DIR)\\ + libname + : $(BUILD_DIR)\\ + dllname); + MFO.WriteBlankLines(1); + MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname); MFO.WriteLine(\t + ld + $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS) $(BUILD_DIR)\\ + resname + /link /out:$(BUILD_DIR)\\ + dllname + $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + )); MFO.WriteLine([EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)); MFO.WriteBlankLines(1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
dmitry Fri Nov 10 10:38:23 2006 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
Fix warnings
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.63r2=1.64diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.63
php-src/win32/build/confutils.js:1.64
--- php-src/win32/build/confutils.js:1.63 Fri Nov 10 10:30:56 2006
+++ php-src/win32/build/confutils.jsFri Nov 10 10:38:23 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.63 2006/11/10 10:30:56 dmitry Exp $
+// $Id: confutils.js,v 1.64 2006/11/10 10:38:23 dmitry Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -915,10 +915,6 @@
ldflags = $(LDFLAGS);
}
- if(PHP_VCI = yes || PHP_VCO == yes) {
- ldflags += /PGD:$(BUILD_DIR)\\+makefiletarget+.pgd;
- }
-
if (ld) {
MFO.WriteLine(\t + ld + /nologo /out:$(BUILD_DIR)\\ +
makefiletarget + + ldflags + $( + SAPI + _GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LDFLAGS_ + SAPI + ) $(LIBS_ + SAPI + )
$(BUILD_DIR)\\ + resname);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
edink Sun May 7 00:07:53 2006 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
MFB: Enable separate build dir for SAPIs, the same way it is possible for
EXTENSIONs
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/confutils.js?r1=1.61r2=1.62diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.61
php-src/win32/build/confutils.js:1.62
--- php-src/win32/build/confutils.js:1.61 Sun Jan 1 13:09:59 2006
+++ php-src/win32/build/confutils.jsSun May 7 00:07:53 2006
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.61 2006/01/01 13:09:59 sniper Exp $
+// $Id: confutils.js,v 1.62 2006/05/07 00:07:53 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -871,14 +871,20 @@
return resname;
}
-function SAPI(sapiname, file_list, makefiletarget, cflags)
+function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
{
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
var ld = @$(LD);
- STDOUT.WriteLine(Enabling SAPI + configure_module_dirname);
+ if (typeof(obj_dir) == undefined) {
+ sapiname_for_printing = configure_module_dirname;
+ } else {
+ sapiname_for_printing = configure_module_dirname + (via +
obj_dir + );
+ }
+
+ STDOUT.WriteLine(Enabling SAPI + sapiname_for_printing);
MFO.WriteBlankLines(1);
MFO.WriteLine(# objects for SAPI + sapiname);
@@ -888,7 +894,7 @@
ADD_FLAG('CFLAGS_' + SAPI, cflags);
}
- ADD_SOURCES(configure_module_dirname, file_list, sapiname);
+ ADD_SOURCES(configure_module_dirname, file_list, sapiname, obj_dir);
MFO.WriteBlankLines(1);
MFO.WriteLine(# SAPI + sapiname);
MFO.WriteBlankLines(1);
@@ -897,7 +903,7 @@
resname = generate_version_info_resource(makefiletarget,
configure_module_dirname);
MFO.WriteLine(makefiletarget + : $(BUILD_DIR)\\ + makefiletarget);
- MFO.WriteLine([EMAIL PROTECTED] SAPI + configure_module_dirname +
build complete);
+ MFO.WriteLine([EMAIL PROTECTED] SAPI + sapiname_for_printing +
build complete);
MFO.WriteLine($(BUILD_DIR)\\ + makefiletarget + : $(DEPS_ + SAPI +
) $( + SAPI + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ +
resname);
if (makefiletarget.match(new RegExp(\\.dll$))) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Thu Jul 7 09:22:39 2005 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
If asked to populate a set of cflags for a header check, only populate the
flags and don't fill in an entry into config.w32.h, UNLESS explicitly told
what to do.
This prevents leakage of things like HAVE_SQLCLI1_H from one pecl into another
(or the core) and confusing the build (as has happened with ibm_db2 and
pdo_odbc).
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.57r2=1.58ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.57
php-src/win32/build/confutils.js:1.58
--- php-src/win32/build/confutils.js:1.57 Thu Jun 9 09:09:04 2005
+++ php-src/win32/build/confutils.jsThu Jul 7 09:22:38 2005
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.57 2005/06/09 13:09:04 wez Exp $
+// $Id: confutils.js,v 1.58 2005/07/07 13:22:38 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -815,10 +815,15 @@
sym = header_name.toUpperCase();
sym = sym.replace(new RegExp([/\.-], g), _);
+ if (typeof(add_to_flag_only) == undefined
+ flag_name.match(new RegExp(^CFLAGS_(.*)$))) {
+ add_to_flag_only = true;
+ }
+
if (typeof(add_to_flag_only) != undefined) {
ADD_FLAG(flag_name, /DHAVE_ + sym + = + have);
} else {
- AC_DEFINE(HAVE_ + sym, have);
+ AC_DEFINE(HAVE_ + sym, have, have the + header_name +
header file);
}
return p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Sun Jun 5 15:19:13 2005 EDT Modified files: /php-src/win32/buildconfutils.js Log: don't screw up the default fd set size when --disable-all is used http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.55r2=1.56ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.55 php-src/win32/build/confutils.js:1.56 --- php-src/win32/build/confutils.js:1.55 Fri Feb 25 20:07:48 2005 +++ php-src/win32/build/confutils.jsSun Jun 5 15:19:09 2005 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.55 2005/02/26 01:07:48 edink Exp $ +// $Id: confutils.js,v 1.56 2005/06/05 19:19:09 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -350,7 +350,7 @@ 'php-build', 'snapshot-template', 'pcre-regex', 'fastcgi', 'force-cgi-redirect', 'path-info-check', 'zts', 'ipv6', 'memory-limit', -'zend-multibyte' +'zend-multibyte', 'fd-setsize' ); var force; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Sun Feb 13 16:38:39 2005 EDT Modified files: /php-src/win32/buildconfutils.js Log: fix snaps http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.53r2=1.54ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.53 php-src/win32/build/confutils.js:1.54 --- php-src/win32/build/confutils.js:1.53 Sun Feb 6 18:23:05 2005 +++ php-src/win32/build/confutils.jsSun Feb 13 16:38:39 2005 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.53 2005/02/06 23:23:05 wez Exp $ +// $Id: confutils.js,v 1.54 2005/02/13 21:38:39 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -349,7 +349,8 @@ 'debug', 'crt-debug', 'lzf-better-compression', 'php-build', 'snapshot-template', 'pcre-regex', 'fastcgi', 'force-cgi-redirect', -'path-info-check', 'zts', 'ipv6', 'memory-limit' +'path-info-check', 'zts', 'ipv6', 'memory-limit', +'zend-multibyte' ); var force; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Sun Feb 6 17:48:37 2005 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
less noise
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.51r2=1.52ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.51
php-src/win32/build/confutils.js:1.52
--- php-src/win32/build/confutils.js:1.51 Wed Jan 19 22:24:50 2005
+++ php-src/win32/build/confutils.jsSun Feb 6 17:48:35 2005
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.51 2005/01/20 03:24:50 wez Exp $
+// $Id: confutils.js,v 1.52 2005/02/06 22:48:35 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1130,7 +1130,7 @@
}
} else {
MFO.WriteLine(sub_build + obj + : + dir + \\ +
src);
- MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( +
bd_flags_name + ) /c + dir + \\ + src + /Fo + sub_build + obj);
+ MFO.WriteLine([EMAIL PROTECTED](CC) $( + flags + )
$(CFLAGS) $( + bd_flags_name + ) /c + dir + \\ + src + /Fo + sub_build
+ obj);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Wed Jan 19 22:24:50 2005 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
A couple more adjustments for building multiple output variants of the same
extension source.
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.50r2=1.51ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.50
php-src/win32/build/confutils.js:1.51
--- php-src/win32/build/confutils.js:1.50 Tue Jan 18 17:37:12 2005
+++ php-src/win32/build/confutils.jsWed Jan 19 22:24:50 2005
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.50 2005/01/18 22:37:12 fmk Exp $
+// $Id: confutils.js,v 1.51 2005/01/20 03:24:50 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -708,7 +708,7 @@
}
-function CHECK_FUNC_IN_HEADER(header_name, func_name, path_to_check)
+function CHECK_FUNC_IN_HEADER(header_name, func_name, path_to_check,
add_to_flag)
{
var c = false;
var sym;
@@ -720,7 +720,11 @@
sym = func_name.toUpperCase();
sym = sym.replace(new RegExp([/\.-], g), _);
- AC_DEFINE(HAVE_ + sym, c ? 1 : 0);
+ if (typeof(add_to_flag) == undefined) {
+ AC_DEFINE(HAVE_ + sym, c ? 1 : 0);
+ } else {
+ ADD_FLAG(add_to_flag, /DHAVE_ + sym + = + (c ? 1 : 0));
+ }
if (c) {
STDOUT.WriteLine(OK);
@@ -766,7 +770,7 @@
return false;
}
-function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check,
use_env, add_dir_part)
+function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check,
use_env, add_dir_part, add_to_flag_only)
{
var dir_part_to_add = ;
@@ -810,7 +814,11 @@
sym = header_name.toUpperCase();
sym = sym.replace(new RegExp([/\.-], g), _);
- AC_DEFINE(HAVE_ + sym, have);
+ if (typeof(add_to_flag_only) != undefined) {
+ ADD_FLAG(flag_name, /DHAVE_ + sym + = + have);
+ } else {
+ AC_DEFINE(HAVE_ + sym, have);
+ }
return p;
}
@@ -963,6 +971,7 @@
{
var objs = null;
var EXT = extname.toUpperCase();
+ var extname_for_printing;
if (shared == null) {
eval(shared = PHP_ + EXT + _SHARED;);
@@ -971,12 +980,18 @@
cflags = ;
}
+ if (typeof(obj_dir) == undefined) {
+ extname_for_printing = configure_module_dirname;
+ } else {
+ extname_for_printing = configure_module_dirname + (via +
obj_dir + );
+ }
+
if (shared) {
- STDOUT.WriteLine(Enabling extension +
configure_module_dirname + [shared]);
+ STDOUT.WriteLine(Enabling extension + extname_for_printing +
[shared]);
cflags = /D COMPILE_DL_ + EXT + /D + EXT + _EXPORTS=1
+ cflags;
ADD_FLAG(CFLAGS_PHP, /D COMPILE_DL_ + EXT);
} else {
- STDOUT.WriteLine(Enabling extension +
configure_module_dirname);
+ STDOUT.WriteLine(Enabling extension + extname_for_printing);
}
MFO.WriteBlankLines(1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build confutils.js
Hi Frank, The following change breaks one shot build badly. - DEFINE(bd_flags_name, /Fo + sub_build + /Fd + sub_build + /Fp + sub_build + /FR + sub_build + ); + DEFINE(bd_flags_name, /Fd + sub_build + /Fp + sub_build + /FR + sub_build + ); Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Wed Nov 10 15:12:45 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Make sure files are stored in the right directory
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.46r2=1.47ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.46
php-src/win32/build/confutils.js:1.47
--- php-src/win32/build/confutils.js:1.46 Mon Aug 2 20:58:29 2004
+++ php-src/win32/build/confutils.jsWed Nov 10 15:12:42 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.46 2004/08/03 00:58:29 wez Exp $
+// $Id: confutils.js,v 1.47 2004/11/10 20:12:42 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1109,7 +1109,7 @@
}
} else {
MFO.WriteLine(sub_build + obj + : + dir + \\ +
src);
- MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( +
bd_flags_name + ) -c + dir + \\ + src + -o + sub_build + obj);
+ MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( +
bd_flags_name + ) + dir + \\ + src + /Fo + sub_build + obj);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Wed Nov 10 18:52:59 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
No need to ude /Fo twice.
Unbreak the build be readding the compile only flag
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.47r2=1.48ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.47
php-src/win32/build/confutils.js:1.48
--- php-src/win32/build/confutils.js:1.47 Wed Nov 10 15:12:42 2004
+++ php-src/win32/build/confutils.jsWed Nov 10 18:52:56 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.47 2004/11/10 20:12:42 fmk Exp $
+// $Id: confutils.js,v 1.48 2004/11/10 23:52:56 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1092,7 +1092,7 @@
sub_build += d;
- DEFINE(bd_flags_name, /Fo + sub_build + /Fd + sub_build + /Fp +
sub_build + /FR + sub_build + );
+ DEFINE(bd_flags_name, /Fd + sub_build + /Fp + sub_build + /FR
+ sub_build + );
for (i in file_list) {
src = file_list[i];
@@ -1109,7 +1109,7 @@
}
} else {
MFO.WriteLine(sub_build + obj + : + dir + \\ +
src);
- MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( +
bd_flags_name + ) + dir + \\ + src + /Fo + sub_build + obj);
+ MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( +
bd_flags_name + ) /c + dir + \\ + src + /Fo + sub_build + obj);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Mon Aug 2 13:54:50 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Search in PATH before explicit_path. This resolves conflict between Microsoft and
cygwin tools with the same name.
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.42r2=1.43ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.42 php-src/win32/build/confutils.js:1.43
--- php-src/win32/build/confutils.js:1.42 Wed Jul 7 08:25:10 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 13:54:49 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.42 2004/07/07 12:25:10 edink Exp $
+// $Id: confutils.js,v 1.43 2004/08/02 17:54:49 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -456,7 +456,20 @@
thing_to_find = thing_to_find.replace(new RegExp(/, g), \\);
- if (explicit_path != null) {
+ if (env_name != null) {
+ env = WshShell.Environment(Process).Item(env_name);
+ env = env.split(;);
+ for (i = 0; i env.length; i++) {
+ file = glob(env[i] + \\ + thing_to_find);
+ if (file) {
+ found = true;
+ place = true;
+ break;
+ }
+ }
+ }
+
+ if (!found explicit_path != null) {
if (typeof(explicit_path) == string) {
explicit_path = explicit_path.split(;);
}
@@ -467,19 +480,6 @@
found = true;
place = file[0];
place = place.substr(0, place.length -
thing_to_find.length - 1);
- break;
- }
- }
- }
-
- if (!found env_name != null) {
- env = WshShell.Environment(Process).Item(env_name);
- env = env.split(;);
- for (i = 0; i env.length; i++) {
- file = glob(env[i] + \\ + thing_to_find);
- if (file) {
- found = true;
- place = true;
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Mon Aug 2 14:48:50 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
VC6 hack to avoid CONFIGURE_COMMAND string length over 2048 when building many
extensions
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.43r2=1.44ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.43 php-src/win32/build/confutils.js:1.44
--- php-src/win32/build/confutils.js:1.43 Mon Aug 2 13:54:49 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 14:48:49 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.43 2004/08/02 17:54:49 fmk Exp $
+// $Id: confutils.js,v 1.44 2004/08/02 18:48:49 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -256,7 +256,9 @@
args = WScript.Arguments;
for (i = 0; i args.length; i++) {
arg = args(i);
- nice += ' ' + arg + '';
+ if (nice.length + arg.length 2045) { // The max string length for
CONFIGURE_COMMAND is 2048 in VC6
+ nice += ' ' + arg + '';
+ }
if (arg == --help) {
configure_help_mode = true;
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Mon Aug 2 20:02:49 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
A better fix for the VC 2k max literal string limit
(also affects vc7)
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.44r2=1.45ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.44 php-src/win32/build/confutils.js:1.45
--- php-src/win32/build/confutils.js:1.44 Mon Aug 2 14:48:49 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 20:02:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.44 2004/08/02 18:48:49 fmk Exp $
+// $Id: confutils.js,v 1.45 2004/08/03 00:02:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -256,9 +256,7 @@
args = WScript.Arguments;
for (i = 0; i args.length; i++) {
arg = args(i);
- if (nice.length + arg.length 2045) { // The max string length for
CONFIGURE_COMMAND is 2048 in VC6
- nice += ' ' + arg + '';
- }
+ nice += ' ' + arg + '';
if (arg == --help) {
configure_help_mode = true;
break;
@@ -1212,8 +1210,9 @@
outfile.Write(indata);
var keys = (new VBArray(configure_hdr.Keys())).toArray();
- var i;
+ var i, j;
var item;
+ var pieces, stuff_to_crack, chunk;
outfile.WriteBlankLines(1);
outfile.WriteLine(/* values determined by configure.js */);
@@ -1222,7 +1221,29 @@
item = configure_hdr.Item(keys[i]);
outfile.WriteBlankLines(1);
outfile.WriteLine(/* + item[1] + */);
- outfile.WriteLine(#define + keys[i] + + item[0]);
+ pieces = item[0];
+
+ if (typeof(pieces) == string pieces.charCodeAt(0) == 34) {
+ /* quoted string have a maximal length of 2k under vc.
+* solution is to crack them and let the compiler concat
+* them implicitly */
+ stuff_to_crack = pieces;
+ pieces = ;
+
+ while (stuff_to_crack.length) {
+ j = 65;
+ while (stuff_to_crack.charCodeAt(j) != 32 j
stuff_to_crack.length)
+ j++;
+
+ chunk = stuff_to_crack.substr(0, j);
+ pieces += chunk;
+ stuff_to_crack = stuff_to_crack.substr(chunk.length);
+ if (stuff_to_crack.length)
+ pieces += ' ';
+ }
+ }
+
+ outfile.WriteLine(#define + keys[i] + + pieces);
}
outfile.Close();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Mon Aug 2 20:58:29 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Revert the search path tweak; it broke the snap build for ming
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.45r2=1.46ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.45 php-src/win32/build/confutils.js:1.46
--- php-src/win32/build/confutils.js:1.45 Mon Aug 2 20:02:48 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 20:58:29 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.45 2004/08/03 00:02:48 wez Exp $
+// $Id: confutils.js,v 1.46 2004/08/03 00:58:29 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -456,20 +456,7 @@
thing_to_find = thing_to_find.replace(new RegExp(/, g), \\);
- if (env_name != null) {
- env = WshShell.Environment(Process).Item(env_name);
- env = env.split(;);
- for (i = 0; i env.length; i++) {
- file = glob(env[i] + \\ + thing_to_find);
- if (file) {
- found = true;
- place = true;
- break;
- }
- }
- }
-
- if (!found explicit_path != null) {
+ if (explicit_path != null) {
if (typeof(explicit_path) == string) {
explicit_path = explicit_path.split(;);
}
@@ -480,6 +467,19 @@
found = true;
place = file[0];
place = place.substr(0, place.length -
thing_to_find.length - 1);
+ break;
+ }
+ }
+ }
+
+ if (!found env_name != null) {
+ env = WshShell.Environment(Process).Item(env_name);
+ env = env.split(;);
+ for (i = 0; i env.length; i++) {
+ file = glob(env[i] + \\ + thing_to_find);
+ if (file) {
+ found = true;
+ place = true;
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
edink Wed Jul 7 08:25:10 2004 EDT Modified files: /php-src/win32/buildconfutils.js Log: Added memory-limit to the list of excluded force-on options http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.41r2=1.42ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.41 php-src/win32/build/confutils.js:1.42 --- php-src/win32/build/confutils.js:1.41 Tue May 18 05:58:45 2004 +++ php-src/win32/build/confutils.jsWed Jul 7 08:25:10 2004 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.41 2004/05/18 09:58:45 wez Exp $ +// $Id: confutils.js,v 1.42 2004/07/07 12:25:10 edink Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -349,7 +349,7 @@ 'debug', 'crt-debug', 'lzf-better-compression', 'php-build', 'snapshot-template', 'pcre-regex', 'fastcgi', 'force-cgi-redirect', -'path-info-check', 'zts', 'ipv6' +'path-info-check', 'zts', 'ipv6', 'memory-limit' ); var force; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Tue May 18 05:58:45 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Primitive support for probing headers for functions using a regexp
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.40r2=1.41ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.40 php-src/win32/build/confutils.js:1.41
--- php-src/win32/build/confutils.js:1.40 Wed Apr 28 20:17:09 2004
+++ php-src/win32/build/confutils.jsTue May 18 05:58:45 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.40 2004/04/29 00:17:09 wez Exp $
+// $Id: confutils.js,v 1.41 2004/05/18 09:58:45 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -708,6 +708,64 @@
}
+function CHECK_FUNC_IN_HEADER(header_name, func_name, path_to_check)
+{
+ var c = false;
+ var sym;
+
+ STDOUT.Write(Checking for + func_name + in + header_name + ... );
+
+ c = GREP_HEADER(header_name, func_name, path_to_check);
+
+ sym = func_name.toUpperCase();
+ sym = sym.replace(new RegExp([/\.-], g), _);
+
+ AC_DEFINE(HAVE_ + sym, c ? 1 : 0);
+
+ if (c) {
+ STDOUT.WriteLine(OK);
+ return c;
+ }
+ STDOUT.WriteLine(No);
+ return false;
+}
+
+function GREP_HEADER(header_name, regex, path_to_check)
+{
+ var c = false;
+
+ if (FSO.FileExists(path_to_check + \\ + header_name)) {
+ c = file_get_contents(path_to_check + \\ + header_name);
+ }
+
+ if (!c) {
+ /* look in the include path */
+
+ var p = search_paths(header_name, path_to_check, INCLUDE);
+ if (typeof(p) == string) {
+ c = file_get_contents(p);
+ } else if (p == false) {
+ p = search_paths(header_name, PHP_EXTRA_INCLUDES, null);
+ if (typeof(p) == string) {
+ c = file_get_contents(p);
+ }
+ }
+ if (!c) {
+ return false;
+ }
+ }
+
+ if (typeof(regex) == string) {
+ regex = new RegExp(regex);
+ }
+
+ if (c.match(regex)) {
+ /* caller can now use RegExp.$1 etc. to get at patterns */
+ return true;
+ }
+ return false;
+}
+
function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env,
add_dir_part)
{
var dir_part_to_add = ;
@@ -853,10 +911,15 @@
function file_get_contents(filename)
{
var f, c;
- f = FSO.OpenTextFile(filename, 1);
- c = f.ReadAll();
- f.Close();
- return c;
+ try {
+ f = FSO.OpenTextFile(filename, 1);
+ c = f.ReadAll();
+ f.Close();
+ return c;
+ } catch (e) {
+ STDOUT.WriteLine(Problem reading + filename);
+ return false;
+ }
}
// Add a dependency on another extension, so that
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Thu Apr 15 12:09:36 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Fix bug that prevented --without-gd from working
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.38r2=1.39ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.38 php-src/win32/build/confutils.js:1.39
--- php-src/win32/build/confutils.js:1.38 Thu Feb 12 07:30:41 2004
+++ php-src/win32/build/confutils.jsThu Apr 15 12:09:36 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.38 2004/02/12 12:30:41 wez Exp $
+// $Id: confutils.js,v 1.39 2004/04/15 16:09:36 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -139,7 +139,7 @@
{
var opptype = type == enable ? disable : without;
- if (defval == yes) {
+ if (defval == yes || defval == yes,shared) {
this.arg = -- + opptype + - + optname;
this.imparg = -- + type + - + optname;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Fri Jan 9 06:19:41 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
fix PHP_SPL problem when you don't have a pecl checkout.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.34 php-src/win32/build/confutils.js:1.35
--- php-src/win32/build/confutils.js:1.34 Thu Jan 8 16:53:48 2004
+++ php-src/win32/build/confutils.jsFri Jan 9 06:19:40 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.34 2004/01/08 21:53:48 wez Exp $
+// $Id: confutils.js,v 1.35 2004/01/09 11:19:40 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -792,15 +792,22 @@
{
var EXT = extname.toUpperCase();
var DEP = dependson.toUpperCase();
+ var dep_present = false;
+ var dep_shared = false;
+ try {
+ dep_present = eval(PHP_ + DEP);
+ dep_shared = eval(PHP_ + DEP + _SHARED);
+ } catch (e) {
+ dep_present = no;
+ dep_shared = false;
+ }
+
if (optional) {
- var dep_present = eval(PHP_ + DEP);
-
if (dep_present == no)
return;
}
- var dep_shared = eval(PHP_ + DEP + _SHARED);
var ext_shared = eval(PHP_ + EXT + _SHARED);
if (dep_shared) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Wed Jan 7 19:25:49 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Change ordering of CFLAGS for built sources, so that extension specific include dirs
occur before more global include dirs.
This avoids problems when building a bundled lib and you have headers from an
external version of that lib in your global include dir.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.31 php-src/win32/build/confutils.js:1.32
--- php-src/win32/build/confutils.js:1.31 Wed Jan 7 15:06:32 2004
+++ php-src/win32/build/confutils.jsWed Jan 7 19:25:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.31 2004/01/07 20:06:32 wez Exp $
+// $Id: confutils.js,v 1.32 2004/01/08 00:25:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -952,13 +952,13 @@
}
} else {
MFO.WriteLine(sub_build + obj + : + dir + \\ + src);
- MFO.WriteLine(\t$(CC) $(CFLAGS) $( + flags + ) $( +
bd_flags_name + ) -c + dir + \\ + src + -o + sub_build + obj);
+ MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( +
bd_flags_name + ) -c + dir + \\ + src + -o + sub_build + obj);
}
}
if (PHP_ONE_SHOT == yes) {
MFO.WriteLine(objs_line + : + srcs_line);
- MFO.WriteLine(\t$(CC) $(CFLAGS) $( + flags + ) $( + bd_flags_name
+ ) -c + srcs_line);
+ MFO.WriteLine(\t$(CC) $( + flags + ) $(CFLAGS) $( + bd_flags_name
+ ) -c + srcs_line);
}
DEFINE(sym, tv);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Tue Dec 23 08:11:05 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Attempt to work around apparent problems with WshShell.CurrentDirectory.
# Andi, please try this now
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.28 php-src/win32/build/confutils.js:1.29
--- php-src/win32/build/confutils.js:1.28 Mon Dec 22 20:55:33 2003
+++ php-src/win32/build/confutils.jsTue Dec 23 08:10:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.28 2003/12/23 01:55:33 wez Exp $
+// $Id: confutils.js,v 1.29 2003/12/23 13:10:54 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -35,6 +35,12 @@
STDERR.WriteLine(Must be run from the root of the php source);
WScript.Quit(10);
}
+
+var CWD = WshShell.CurrentDirectory;
+
+if (typeof(CWD) == undefined) {
+ CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName(README.CVS-RULES));
+}
/* defaults; we pick up the precise versions from configure.in */
var PHP_VERSION = 5;
@@ -80,17 +86,15 @@
function condense_path(path)
{
- var cd = WshShell.CurrentDirectory;
-
path = FSO.GetAbsolutePathName(path);
- if (path.substr(0, cd.length).toLowerCase()
- == cd.toLowerCase()
- (path.charCodeAt(cd.length) == 92 ||
path.charCodeAt(cd.length) == 47)) {
- return path.substr(cd.length + 1);
+ if (path.substr(0, CWD.length).toLowerCase()
+ == CWD.toLowerCase()
+ (path.charCodeAt(CWD.length) == 92 ||
path.charCodeAt(CWD.length) == 47)) {
+ return path.substr(CWD.length + 1);
}
- var a = cd.split(\\);
+ var a = CWD.split(\\);
var b = path.split(\\);
var i, j;
@@ -836,7 +840,7 @@
STDOUT.WriteLine(Generating main/internal_functions.c);
- infile = FSO.OpenTextFile(WshShell.CurrentDirectory +
/main/internal_functions.c.in, 1);
+ infile = FSO.OpenTextFile(main/internal_functions.c.in, 1);
indata = infile.ReadAll();
infile.Close();
@@ -852,7 +856,7 @@
}
}
- outfile = FSO.CreateTextFile(WshShell.CurrentDirectory +
/main/internal_functions.c, true);
+ outfile = FSO.CreateTextFile(main/internal_functions.c, true);
outfile.Write(indata);
outfile.Close();
}
@@ -908,11 +912,11 @@
STDOUT.WriteLine(Generating main/config.w32.h);
- infile = FSO.OpenTextFile(WshShell.CurrentDirectory +
/win32/build/config.w32.h.in, 1);
+ infile = FSO.OpenTextFile(win32/build/config.w32.h.in, 1);
indata = infile.ReadAll();
infile.Close();
- outfile = FSO.CreateTextFile(WshShell.CurrentDirectory + /main/config.w32.h,
true);
+ outfile = FSO.CreateTextFile(main/config.w32.h, true);
indata = indata.replace(new RegExp(@PREFIX@, g), prefix);
outfile.Write(indata);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Mon Dec 22 19:17:15 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Fix build when both a path and the keyword shared is given
Now works for both path,shared and shared,path
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.25 php-src/win32/build/confutils.js:1.26
--- php-src/win32/build/confutils.js:1.25 Mon Dec 22 17:33:43 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 19:17:15 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.25 2003/12/22 22:33:43 wez Exp $
+// $Id: confutils.js,v 1.26 2003/12/23 00:17:15 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -157,9 +157,12 @@
argval = yes;
} else if (argval == null) {
/* nothing */
- } else if (argval.match(new RegExp(^shared,(.* {
+ } else if (args = argval.match(new RegExp(^shared,(.* {
shared = true;
- argval = $1;
+ argval = args[1];
+ } else if (args = argval.match(new RegExp((.*),shared$))) {
+ shared = true;
+ argval = args[1];
}
ret[0] = shared;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Mon Dec 22 19:36:33 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Use a variable name so this actually works.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.26 php-src/win32/build/confutils.js:1.27
--- php-src/win32/build/confutils.js:1.26 Mon Dec 22 19:17:15 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 19:36:32 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.26 2003/12/23 00:17:15 fmk Exp $
+// $Id: confutils.js,v 1.27 2003/12/23 00:36:32 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -157,12 +157,12 @@
argval = yes;
} else if (argval == null) {
/* nothing */
- } else if (args = argval.match(new RegExp(^shared,(.* {
+ } else if (arg_match = argval.match(new RegExp(^shared,(.* {
shared = true;
- argval = args[1];
- } else if (args = argval.match(new RegExp((.*),shared$))) {
+ argval = arg_match[1];
+ } else if (arg_match = argval.match(new RegExp(^(.*),shared$))) {
shared = true;
- argval = args[1];
+ argval = arg_match[1];
}
ret[0] = shared;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Fri Dec 19 11:56:00 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
don't overwrite internal_functions.c if the content did not change;
this saves re-linking php*.dll when you add shared extensions to
your config.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.20 php-src/win32/build/confutils.js:1.21
--- php-src/win32/build/confutils.js:1.20 Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/confutils.jsFri Dec 19 11:55:59 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.20 2003/12/19 12:50:11 wez Exp $
+// $Id: confutils.js,v 1.21 2003/12/19 16:55:59 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -779,11 +779,19 @@
indata = infile.ReadAll();
infile.Close();
- outfile = FSO.CreateTextFile(WshShell.CurrentDirectory +
/main/internal_functions.c, true);
-
indata = indata.replace(@EXT_INCLUDE_CODE@, extension_include_code);
indata = indata.replace(@EXT_MODULE_PTRS@, extension_module_ptrs);
+ if (FSO.FileExists(main/internal_functions.c)) {
+ var origdata = file_get_contents(main/internal_functions.c);
+
+ if (origdata == indata) {
+ STDOUT.WriteLine(\t[content unchanged; skipping]);
+ return;
+ }
+ }
+
+ outfile = FSO.CreateTextFile(WshShell.CurrentDirectory +
/main/internal_functions.c, true);
outfile.Write(indata);
outfile.Close();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Thu Dec 4 12:03:21 2003 EDT Modified files: /php-src/win32/buildconfutils.js Log: fix remaining ext/ Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.15 php-src/win32/build/confutils.js:1.16 --- php-src/win32/build/confutils.js:1.15 Thu Dec 4 08:38:47 2003 +++ php-src/win32/build/confutils.jsThu Dec 4 12:03:20 2003 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.15 2003/12/04 13:38:47 wez Exp $ +// $Id: confutils.js,v 1.16 2003/12/04 17:03:20 fmk Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -573,7 +573,7 @@ /* find the header that declars the module pointer, * so we can include it in internal_functions.c */ - var ext_dir = FSO.GetFolder(ext/ + extname); + var ext_dir = FSO.GetFolder(configure_module_dirname); var fc = new Enumerator(ext_dir.Files); var re = /\.h$/; var s, c; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Wed Dec 3 12:04:31 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
avoid breaking paths with spaces when we generate the makefile, and ensure that libs
found in the default path are added to the link line
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.6 php-src/win32/build/confutils.js:1.7
--- php-src/win32/build/confutils.js:1.6Wed Dec 3 09:55:03 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 12:04:30 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.6 2003/12/03 14:55:03 wez Exp $
+// $Id: confutils.js,v 1.7 2003/12/03 17:04:30 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -359,6 +359,9 @@
ADD_FLAG(LDFLAGS_ + target.toUpperCase(), '/libpath:' + p + ' ');
ADD_FLAG(LIBS_ + target.toUpperCase(), libname);
have = 1;
+ } else if (p == true) {
+ ADD_FLAG(LIBS_ + target.toUpperCase(), libname);
+ have = 1;
}
// AC_DEFINE(HAVE_ + header_name.toUpperCase().replace(new RegExp(/-\.,
g), _), have);
@@ -676,8 +679,10 @@
// The trailing space is needed to prevent the trailing backslash
// that is part of the build dir flags (CFLAGS_BD_XXX) from being
// seen as a line continuation character
- MF.WriteLine(keys[i] + = + word_wrap_and_indent(1,
- configure_subst.Item(keys[i]), ' \\', '\t') + );
+ MF.WriteLine(keys[i] + = +
+ //word_wrap_and_indent(1, configure_subst.Item(keys[i]), '
\\', '\t') +
+ configure_subst.Item(keys[i]) +
+ );
MF.WriteBlankLines(1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Wed Dec 3 21:24:24 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
put PHPDLL objects into BUILD_DIR/php so that it is a little
easier to see the main outputs (sapi and extensions)
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.12 php-src/win32/build/confutils.js:1.13
--- php-src/win32/build/confutils.js:1.12 Wed Dec 3 21:12:36 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 21:24:23 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.12 2003/12/04 02:12:36 wez Exp $
+// $Id: confutils.js,v 1.13 2003/12/04 02:24:23 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -602,10 +602,10 @@
var sub_build = $(BUILD_DIR)\\;
- if (target != php) {
+// if (target != php) {
build_dirs[build_dirs.length] = target;
sub_build += target + \\;
- }
+// }
DEFINE(CFLAGS_BD_ + target.toUpperCase(), /Fo + sub_build + /Fd +
sub_build + /Fp + sub_build + /FR + sub_build + );
for (i in file_list) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Tue Dec 2 19:56:15 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Avoid death when wrapping null/undefined values
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.2 php-src/win32/build/confutils.js:1.3
--- php-src/win32/build/confutils.js:1.2Tue Dec 2 19:15:10 2003
+++ php-src/win32/build/confutils.jsTue Dec 2 19:56:14 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.2 2003/12/03 00:15:10 wez Exp $
+// $Id: confutils.js,v 1.3 2003/12/03 00:56:14 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -88,6 +88,10 @@
function word_wrap_and_indent(indent, text, line_suffix, indent_char)
{
+ if (text == null) {
+ return ;
+ }
+
var words = text.split(new RegExp(\\s+, g));
var i = 0;
var ret_text = ;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
