[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2009-05-29 Thread Kalle Sommer Nielsen 
kalle   Fri May 29 07:43:07 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  MFH: 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.60.2.1.2.8.2.32r2=1.60.2.1.2.8.2.33diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.32 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.33
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.32  Thu Dec 25 00:08:51 2008
+++ php-src/win32/build/confutils.jsFri May 29 07:43:07 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.32 2008/12/25 00:08:51 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.33 2009/05/29 07:43:07 kalle Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1568,9 +1568,12 @@
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(PHP_5_3) /win32/build confutils.js

2008-11-21 Thread Pierre-Alain Joye 
pajoye  Fri Nov 21 14:17:34 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - MFH: 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.60.2.1.2.8.2.30r2=1.60.2.1.2.8.2.31diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.30 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.31
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.30  Thu Sep 25 15:00:59 2008
+++ php-src/win32/build/confutils.jsFri Nov 21 14:17:33 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.30 2008/09/25 15:00:59 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.31 2008/11/21 14:17:33 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1481,8 +1481,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(PHP_5_3) /win32/build confutils.js

2008-07-25 Thread Pierre-Alain Joye 
pajoye  Fri Jul 25 12:40:45 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - MFH: 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.60.2.1.2.8.2.28r2=1.60.2.1.2.8.2.29diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.28 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.29
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.28  Sun Jul 20 02:20:31 2008
+++ php-src/win32/build/confutils.jsFri Jul 25 12:40:45 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.28 2008/07/20 02:20:31 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.29 2008/07/25 12:40:45 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1145,10 +1145,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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-07-19 Thread Steph Fox 
sfoxSat Jul 19 16:57:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - Rejig REMOVE_TARGET
  - Tidy ADD_EXTENSION_DEP
  - Put summary output in alphabetical order
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.25r2=1.60.2.1.2.8.2.26diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.25 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.26
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.25  Fri Jul 18 15:45:03 2008
+++ php-src/win32/build/confutils.jsSat Jul 19 16:57:58 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.25 2008/07/18 15:45:03 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.26 2008/07/19 16:57:58 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1123,23 +1123,18 @@
if (ext_shared) {
WARNING(extname +  cannot be built: missing 
dependency,  + dependson +  not found);
 
-   if (configure_hdr.Exists('HAVE_' + EXT)) {
-   configure_hdr.Remove('HAVE_' + EXT);
-   }
-
-   dllname = ' php_' + extname + '.dll';
+   var dllname = ' php_' + extname + '.dll';
 
if (!REMOVE_TARGET(dllname, 'EXT_TARGETS')) {
REMOVE_TARGET(dllname, 'PECL_TARGETS');
}
 
-   extensions_enabled.pop();
return false;
 
-   } else {
-   ERROR(Cannot build  + extname + ;  + 
dependson +  not enabled);
-   return false;
}
+
+   ERROR(Cannot build  + extname + ;  + dependson +  
not enabled);
+   return false;
}
} // dependency is statically built-in to PHP
return true;
@@ -1331,22 +1326,22 @@
 
 function REMOVE_TARGET(dllname, flag)
 {
-   dllname = dllname.replace(/\s/g, );
-   EXT = dllname.replace(/php_(\S+)\.dll/, $1).toUpperCase();
-
-   php_flags = configure_subst.Item(CFLAGS_PHP);
-   configure_subst.Remove(CFLAGS_PHP);
-   php_flags = php_flags.replace( /D COMPILE_DL_ + EXT, );
-   configure_subst.Add(CFLAGS_PHP, php_flags);
+   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)) {
-   targets = configure_subst.Item(flag);
+   var 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;
}
}
@@ -1469,7 +1464,7 @@
STDOUT.WriteBlankLines(2);
 
STDOUT.WriteLine(Enabled extensions:);
-   output_as_table([Extension, Mode], extensions_enabled);
+   output_as_table([Extension, Mode], extensions_enabled.sort());
STDOUT.WriteBlankLines(2);
 
STDOUT.WriteLine(Enabled SAPI:);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-07-19 Thread Steph Fox 
sfoxSat Jul 19 19:02:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - Fix logic in get_define()
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.26r2=1.60.2.1.2.8.2.27diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.26 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.27
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.26  Sat Jul 19 16:57:58 2008
+++ php-src/win32/build/confutils.jsSat Jul 19 19:02:59 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.26 2008/07/19 16:57:58 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.27 2008/07/19 19:02:59 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1652,7 +1652,10 @@
 
 function get_define(name)
 {
-   return configure_subst.Item(name);
+   if (configure_subst.Exists(name)) {
+   return configure_subst.Item(name);
+   }
+   return ;
 }
 
 // Add a .def to the core to export symbols



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-07-18 Thread Steph Fox 
sfoxFri Jul 18 15:45:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - Make REMOVE_TARGET work in all cases
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.24r2=1.60.2.1.2.8.2.25diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.24 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.25
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.24  Sat Jul 12 15:04:39 2008
+++ php-src/win32/build/confutils.jsFri Jul 18 15:45:03 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.24 2008/07/12 15:04:39 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.25 2008/07/18 15:45:03 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1331,11 +1331,21 @@
 
 function REMOVE_TARGET(dllname, flag)
 {
+   dllname = dllname.replace(/\s/g, );
+   EXT = dllname.replace(/php_(\S+)\.dll/, $1).toUpperCase();
+
+   php_flags = configure_subst.Item(CFLAGS_PHP);
+   configure_subst.Remove(CFLAGS_PHP);
+   php_flags = php_flags.replace( /D COMPILE_DL_ + EXT, );
+   configure_subst.Add(CFLAGS_PHP, php_flags);
+
if (configure_subst.Exists(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);
return true;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-07-12 Thread Steph Fox 
sfoxSat Jul 12 15:04:39 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  This looks more than it is due to ws/cs and minor fixes in it...
  - Fixes logic in dependency check
  - Fixes logic in AC_DEFINE error message
  - Prevents shared extensions from building if a hard dependency is missing 
altogether
  - Cleans up errors/warnings/messages for all scenarios
  - Changes a function call to the new project support
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.23r2=1.60.2.1.2.8.2.24diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.23 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.24
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.23  Wed Jul  9 08:15:46 2008
+++ php-src/win32/build/confutils.jsSat Jul 12 15:04:39 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.23 2008/07/09 08:15:46 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.24 2008/07/12 15:04:39 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1082,15 +1082,24 @@
 
try {
dep_present = eval(PHP_ + DEP);
-   dep_shared = eval(PHP_ + DEP + _SHARED);
+
+   if (dep_present != no) {
+   try {
+   dep_shared = eval(PHP_ + DEP + _SHARED);
+   } catch (e) {
+   dep_shared = false;
+   }
+   }
+
} catch (e) {
dep_present = no;
-   dep_shared = false;
}
-   
+
if (optional) {
-   if (dep_present == no)
+   if (dep_present == no) {
+   MESSAGE(\t + dependson +  not found:  + dependson + 
 support in  + extname +  disabled);
return false;
+   }
}
 
var ext_shared = eval(PHP_ + EXT + _SHARED);
@@ -1098,18 +1107,35 @@
if (dep_shared) {
if (!ext_shared) {
if (optional) {
+   MESSAGE(\tstatic  + extname +  cannot depend 
on shared  + dependson + :  + dependson + support disabled);
return false;
}
ERROR(static  + extname +  cannot depend on shared  
+ dependson);
}
+
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);
+   WARNING(extname +  cannot be built: missing 
dependency,  + dependson +  not found);
+
+   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;
+
} else {
ERROR(Cannot build  + extname + ;  + 
dependson +  not enabled);
return false;
@@ -1303,6 +1329,20 @@
DEFINE(sym, tv);
 }
 
+function REMOVE_TARGET(dllname, flag)
+{
+   if (configure_subst.Exists(flag)) {
+   targets = configure_subst.Item(flag);
+   if (targets.match(dllname)) {
+   configure_subst.Remove(flag);
+   targets = targets.replace(dllname, );
+   configure_subst.Add(flag, targets);
+   return true;
+   }
+   }
+   return false;
+}
+
 function generate_internal_functions()
 {
var infile, outfile;
@@ -1465,7 +1505,7 @@
generate_dsp_file(win32, win32, null, false);
generate_dsp_file(main, main, null, false);
generate_dsp_file(streams, main\\streams, null, false);
-   generate_dsp_flags();
+   copy_dsp_files();
}
 
STDOUT.WriteLine(Generating files...);
@@ -1633,7 +1673,7 @@
var item = new Array(value, comment);
if (configure_hdr.Exists(name)) {
var orig_item = configure_hdr.Item(name);
-   STDOUT.WriteLine(AC_DEFINE[ + name + ]= + value + : is 
already defined to  +

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-07-05 Thread Marcus Boerger 
Hello Pierre-Alain,

Wednesday, July 2, 2008, 10:50:18 PM, you wrote:

 pajoye  Wed Jul  2 20:50:18 2008 UTC

   Modified files:  (Branch: PHP_5_3)
 /php-src/win32/buildconfutils.js 
   Log:
   - add summary function and VC version info
   
 http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.17r2=1.60.2.1.2.8.2.18diff_format=u
 Index: php-src/win32/build/confutils.js
 diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17
 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.18
 --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17  Mon Jun 23 11:44:21 
 2008
 +++ php-src/win32/build/confutils.jsWed Jul  2 20:50:18 2008
 @@ -17,7 +17,7 @@
+--+
  */
  
 -// $Id: confutils.js,v 1.60.2.1.2.8.2.17 2008/06/23 11:44:21 pajoye Exp $
 +// $Id: confutils.js,v 1.60.2.1.2.8.2.18 2008/07/02 20:50:18 pajoye Exp $
  
  var STDOUT = WScript.StdOut;
  var STDERR = WScript.StdErr;
 @@ -30,6 +30,16 @@
  var extensions_enabled = new Array();
  var sapi_enabled = new Array();
  
 +// 12 is VC6
 +// 13 is vs.net 2003

Iirc, then 1300 is VC 2002 and 1310 is VC 2003

marcus

 +// 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;
  }
 @@ -1304,7 +1314,6 @@
 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;
  
 @@ -1316,8 +1325,14 @@
 if (t  tmax) tmax = t;
 else if (t  tmin) tmin = t;
 }
 -   max[j] = tmax;
 -   min[j] = tmin;
 +   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 = ;
 @@ -1361,6 +1376,27 @@
 STDOUT.WriteLine(sep);
  }
  
 +function write_summary()
 +{
 +   var ar = new Array();
 +
 +   STDOUT.WriteBlankLines(2);
 +
 +   STDOUT.WriteLine(Enabled extensions:);
 +   output_as_table([Extension, Mode], extensions_enabled);
 +   STDOUT.WriteBlankLines(2);
 +
 +   STDOUT.WriteLine(Enabled SAPI:);
 +   output_as_table([Sapi Name], sapi_enabled);
 +   STDOUT.WriteBlankLines(2);
 +
 +   ar[0] = ['Compiler', VC_VERSIONS[VCVERS]];
 +   ar[1] = ['Architecture', X64 ? 'x64' : 'x86'];
 +
 +   output_as_table([,], ar);
 +   STDOUT.WriteBlankLines(2);
 +}
 +
  function generate_files()
  {
 var i, dir, bd, last;
 @@ -1386,24 +1422,16 @@
 FSO.CreateFolder(bd);
 }
 }
 -   
 +   
 STDOUT.WriteLine(Generating files...);
 generate_makefile();
 generate_internal_functions();
 generate_config_h();
 -
 -   STDOUT.WriteBlankLines(2);
 -
 -   STDOUT.WriteLine(Enabled extensions:);
 -   output_as_table([Extension, Mode], extensions_enabled);
 -   STDOUT.WriteBlankLines(2);
 -
 -   STDOUT.WriteLine(Enabled SAPI:);
 -   output_as_table([Sapi Name], sapi_enabled);
 -   STDOUT.WriteBlankLines(2);
 -
 STDOUT.WriteLine(Done.);
 STDOUT.WriteBlankLines(1);
 +
 +   write_summary();
 +
 if (PHP_SNAPSHOT_BUILD != no) {
 STDOUT.WriteLine(Type 'nmake snap' to build a PHP snapshot);
 } else {






Best regards,
 Marcus


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-07-02 Thread Pierre-Alain Joye 
pajoye  Wed Jul  2 20:50:18 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - add summary function and VC version info
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.17r2=1.60.2.1.2.8.2.18diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.18
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17  Mon Jun 23 11:44:21 2008
+++ php-src/win32/build/confutils.jsWed Jul  2 20:50:18 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.17 2008/06/23 11:44:21 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.18 2008/07/02 20:50:18 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -30,6 +30,16 @@
 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;
 }
@@ -1304,7 +1314,6 @@
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;
 
@@ -1316,8 +1325,14 @@
if (t  tmax) tmax = t;
else if (t  tmin) tmin = t;
}
-   max[j] = tmax;
-   min[j] = tmin;
+   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 = ;
@@ -1361,6 +1376,27 @@
STDOUT.WriteLine(sep);
 }
 
+function write_summary()
+{
+   var ar = new Array();
+
+   STDOUT.WriteBlankLines(2);
+
+   STDOUT.WriteLine(Enabled extensions:);
+   output_as_table([Extension, Mode], extensions_enabled);
+   STDOUT.WriteBlankLines(2);
+
+   STDOUT.WriteLine(Enabled SAPI:);
+   output_as_table([Sapi Name], sapi_enabled);
+   STDOUT.WriteBlankLines(2);
+
+   ar[0] = ['Compiler', VC_VERSIONS[VCVERS]];
+   ar[1] = ['Architecture', X64 ? 'x64' : 'x86'];
+
+   output_as_table([,], ar);
+   STDOUT.WriteBlankLines(2);
+}
+
 function generate_files()
 {
var i, dir, bd, last;
@@ -1386,24 +1422,16 @@
FSO.CreateFolder(bd);
}
}
-   
+   
STDOUT.WriteLine(Generating files...);
generate_makefile();
generate_internal_functions();
generate_config_h();
-
-   STDOUT.WriteBlankLines(2);
-
-   STDOUT.WriteLine(Enabled extensions:);
-   output_as_table([Extension, Mode], extensions_enabled);
-   STDOUT.WriteBlankLines(2);
-
-   STDOUT.WriteLine(Enabled SAPI:);
-   output_as_table([Sapi Name], sapi_enabled);
-   STDOUT.WriteBlankLines(2);
-
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);
+
+   write_summary();
+
if (PHP_SNAPSHOT_BUILD != no) {
STDOUT.WriteLine(Type 'nmake snap' to build a PHP snapshot);
} else {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-06-23 Thread Pierre-Alain Joye 
pajoye  Mon Jun 23 08:11:31 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - add a MESSAGE function
[DOC] to be used instead of STDOUT in config.w32, it allows them to be 
redirected (like in a quiet mode)
  - add the list of enabled SAPI
  - improve the table output
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.15r2=1.60.2.1.2.8.2.16diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.15 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.16
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.15  Sun Jun 22 23:15:54 2008
+++ php-src/win32/build/confutils.jsMon Jun 23 08:11:31 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.15 2008/06/22 23:15:54 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.16 2008/06/23 08:11:31 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -28,7 +28,7 @@
 var PROGRAM_FILES = WshShell.Environment(Process).Item(ProgramFiles);
 
 var extensions_enabled = new Array();
-
+var sapi_enabled = new Array();
 
 if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
@@ -1008,6 +1008,7 @@
}
 
MFO.WriteBlankLines(1);
+   sapi_enabled[sapi_enabled.length] = [sapiname];
 }
 
 function ADD_DIST_FILE(filename)
@@ -1318,12 +1319,19 @@
max[j] = tmax;
min[j] = tmin;
}
+
sep = ;
-   k = max[0] + max[1] + 7;
+   k = 0;
+   for (i = 0; i  l; i++) {
+   k += max[i] + 3;
+   }
+   k++;
+
for (j=0; j  k; j++) {
sep += -;
}
 
+   STDOUT.WriteLine(sep);
out = |;
for (j=0; j  l; j++) {
out +=   + header[j];
@@ -1384,9 +1392,16 @@
generate_internal_functions();
generate_config_h();
 
+   STDOUT.WriteBlankLines(2);
+
+   STDOUT.WriteLine(Enabled extensions:);
output_as_table([Extension, Mode], extensions_enabled);
STDOUT.WriteBlankLines(2);
 
+   STDOUT.WriteLine(Enabled SAPI:);
+   output_as_table([Sapi Name], sapi_enabled);
+   STDOUT.WriteBlankLines(2);
+
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);
if (PHP_SNAPSHOT_BUILD != no) {
@@ -1545,6 +1560,11 @@
}
 }
 
+function MESSAGE(msg)
+{
+   STDERR.WriteLine( + msg);
+}
+
 function ERROR(msg)
 {
STDERR.WriteLine(ERROR:  + msg);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-06-23 Thread Steph Fox 


Hi Pierre,


pajoye Mon Jun 23 08:11:31 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/win32/build confutils.js
 Log:
 - add a MESSAGE function
   [DOC] to be used instead of STDOUT in config.w32, it allows them to be 
redirected (like in a quiet mode)

 - add the list of enabled SAPI
 - improve the table output




+function MESSAGE(msg)
+{
+ STDERR.WriteLine( + msg);
+}


Shouldn't that be STDOUT?

- Steph



+
function ERROR(msg)
{
 STDERR.WriteLine(ERROR:  + msg);



--
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(PHP_5_3) /win32/build confutils.js

2008-06-23 Thread Pierre-Alain Joye 
pajoye  Mon Jun 23 11:44:21 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - use stdout for MESSAGE (thx Steph)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.16r2=1.60.2.1.2.8.2.17diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.16 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.17
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.16  Mon Jun 23 08:11:31 2008
+++ php-src/win32/build/confutils.jsMon Jun 23 11:44:21 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.16 2008/06/23 08:11:31 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.17 2008/06/23 11:44:21 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1562,7 +1562,7 @@
 
 function MESSAGE(msg)
 {
-   STDERR.WriteLine( + msg);
+   STDOUT.WriteLine( + msg);
 }
 
 function ERROR(msg)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-06-22 Thread Pierre-Alain Joye 
pajoye  Sun Jun 22 20:51:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - add a list of the enabled extensions and how they are built (shared or 
static
list of SAPIs and libs used will follow shortly (to be used as QA check 
during the builds and as convenience)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.13r2=1.60.2.1.2.8.2.14diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.13 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.14
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.13  Thu Jun 19 17:43:38 2008
+++ php-src/win32/build/confutils.jsSun Jun 22 20:51:57 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.13 2008/06/19 17:43:38 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.14 2008/06/22 20:51:57 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -27,6 +27,9 @@
 var SYSTEM_DRIVE = WshShell.Environment(Process).Item(SystemDrive);
 var PROGRAM_FILES = WshShell.Environment(Process).Item(ProgramFiles);
 
+var extensions_enabled = new Array();
+
+
 if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
 }
@@ -1164,6 +1167,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)
@@ -1281,6 +1285,71 @@
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;
+   }
+   max[j] = tmax;
+   min[j] = tmin;
+   }
+   sep = ;
+   k = max[0] + max[1] + 7;
+   for (j=0; j  k; j++) {
+   sep += -;
+   }
+
+   out = |;
+   for (j=0; j  l; j++) {
+   out +=   + header[j];
+   for (var i = 0; i  (max[j] - header[j].length); i++){
+   out +=  ;
+   }
+   out +=  |;
+   }
+   STDOUT.WriteLine(out);
+
+   STDOUT.WriteLine(sep);
+
+   out = |;
+   for (i=0; i  ar_out.length; i++) {
+   line = ar_out[i];
+   for (j=0; j  l; j++) {
+   out +=   + line[j];
+   for (var k = 0; k  (max[j] - line[j].length); k++){
+   out +=  ;
+   }
+   out +=  |;
+   }
+   STDOUT.WriteLine(out);
+   out = |;
+   }
+
+   STDOUT.WriteLine(sep);
+}
+
 function generate_files()
 {
var i, dir, bd, last;
@@ -1312,6 +1381,8 @@
generate_internal_functions();
generate_config_h();
 
+   output_as_table([Extension, Mode], extensions_enabled);
+   STDOUT.WriteBlankLines(2);
 
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-06-22 Thread Pierre-Alain Joye 
pajoye  Sun Jun 22 23:15:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - return true/false when a dep addition was succeeded or not
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.14r2=1.60.2.1.2.8.2.15diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.14 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.15
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.14  Sun Jun 22 20:51:57 2008
+++ php-src/win32/build/confutils.jsSun Jun 22 23:15:54 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.14 2008/06/22 20:51:57 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.15 2008/06/22 23:15:54 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1052,7 +1052,7 @@

if (optional) {
if (dep_present == no)
-   return;
+   return false;
}
 
var ext_shared = eval(PHP_ + EXT + _SHARED);
@@ -1060,7 +1060,7 @@
if (dep_shared) {
if (!ext_shared) {
if (optional) {
-   return;
+   return false;
}
ERROR(static  + extname +  cannot depend on shared  
+ dependson);
}
@@ -1071,11 +1071,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)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-06-19 Thread Steph Fox 
sfoxThu Jun 19 17:14:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - '' != 'no'
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.11r2=1.60.2.1.2.8.2.12diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.11 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.12
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.11  Wed May 14 03:13:17 2008
+++ php-src/win32/build/confutils.jsThu Jun 19 17:14:43 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.11 2008/05/14 03:13:17 auroraeosrose Exp 
$
+// $Id: confutils.js,v 1.60.2.1.2.8.2.12 2008/06/19 17:14:43 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -416,7 +416,11 @@
}
}
if (force) {
-   argval = no;
+   if (arg.defval == '') {
+   argval = '';
+   } else {
+   argval = no;
+   }
shared = false;
}
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-06-19 Thread Steph Fox 
sfoxThu Jun 19 17:43:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - ext/standard currently has a dependency on ext/ereg thanks to browscap.c
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.12r2=1.60.2.1.2.8.2.13diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.12 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.13
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.12  Thu Jun 19 17:14:43 2008
+++ php-src/win32/build/confutils.jsThu Jun 19 17:43:38 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.12 2008/06/19 17:14:43 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.13 2008/06/19 17:43:38 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -347,7 +347,7 @@
 
var snapshot_build_exclusions = new Array(
'debug', 'crt-debug', 'lzf-better-compression',
-'php-build', 'snapshot-template',
+'php-build', 'snapshot-template', 'ereg',
 'pcre-regex', 'fastcgi', 'force-cgi-redirect',
 'path-info-check', 'zts', 'ipv6', 'memory-limit',
 'zend-multibyte', 'fd-setsize', 'memory-manager', 't1lib'



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-04-14 Thread Steph Fox 
sfoxMon Apr 14 17:55:02 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - Workarounds are no longer needed - thanks PECLers!
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.9r2=1.60.2.1.2.8.2.10diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9   Mon Mar 31 09:17:25 2008
+++ php-src/win32/build/confutils.jsMon Apr 14 17:55:02 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.9 2008/03/31 09:17:25 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.10 2008/04/14 17:55:02 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -846,7 +846,6 @@
var debug = ;
var project_url = http://www.php.net;;
var project_header = creditspath + /php_ + basename + .h;
-   var headerfile = ;
var versioning = ;
 
if (sapi) {
@@ -872,22 +871,10 @@
}
 
if (creditspath.match(new RegExp(pecl))) {
-   /* PECL project url */
+   /* PECL project url - this will eventually work correctly for 
all */
project_url = http://pecl.php.net/; + basename;
 
/* keep independent versioning PECL-specific for now */
-   if (!FSO.FileExists(project_header)) { /* pick up a dozen 
renegades */
-   if (basename == doublemetaphone) headerfile = 
/double_metaphone.h;
-   if (basename == flitetts) headerfile = /php_flite.h;
-   if (basename == gopher) headerfile = 
/gopher_fopen_wrapper.h;
-   if (basename == ingres) headerfile = /php_ii.h;
-   if (basename == iisfunc || basename == ixsfunc) 
headerfile = /setup.h;
-   if (basename == satellite) headerfile = 
/php_orbit.h;
-   if (basename == stats) headerfile = 
/php_statistics.h;
-   if (!headerfile) headerfile = / + basename + .h;
-   project_header = creditspath + headerfile;
-   }
-
if (FSO.FileExists(project_header)) {
if (header = FSO.OpenTextFile(project_header, 1)) {
contents = header.ReadAll();
@@ -918,10 +905,11 @@
 */
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');
+   MFO.WriteLine(\t$(RC) /fo $(BUILD_DIR)\\ + resname + logo + 
debug +
+   ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d 
FILE_NAME=\\' +
+   makefiletarget + '\\ /d PRODUCT_NAME=\\' + 
res_prod_name +
+   versioning + '\\ /d THANKS_GUYS=\\' + thanks + 
'\\ ' +
+   creditspath + '\\template.rc');
return resname;
}
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-31 Thread Steph Fox 
sfoxMon Mar 31 09:17:25 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - Allow most of the existing strangely-named headers to get by
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.8r2=1.60.2.1.2.8.2.9diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.8 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.8   Mon Mar 24 15:11:46 2008
+++ php-src/win32/build/confutils.jsMon Mar 31 09:17:25 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.8 2008/03/24 15:11:46 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.9 2008/03/31 09:17:25 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -846,6 +846,7 @@
var debug = ;
var project_url = http://www.php.net;;
var project_header = creditspath + /php_ + basename + .h;
+   var headerfile = ;
var versioning = ;
 
if (sapi) {
@@ -871,9 +872,22 @@
}
 
if (creditspath.match(new RegExp(pecl))) {
+   /* PECL project url */
project_url = http://pecl.php.net/; + basename;
 
/* keep independent versioning PECL-specific for now */
+   if (!FSO.FileExists(project_header)) { /* pick up a dozen 
renegades */
+   if (basename == doublemetaphone) headerfile = 
/double_metaphone.h;
+   if (basename == flitetts) headerfile = /php_flite.h;
+   if (basename == gopher) headerfile = 
/gopher_fopen_wrapper.h;
+   if (basename == ingres) headerfile = /php_ii.h;
+   if (basename == iisfunc || basename == ixsfunc) 
headerfile = /setup.h;
+   if (basename == satellite) headerfile = 
/php_orbit.h;
+   if (basename == stats) headerfile = 
/php_statistics.h;
+   if (!headerfile) headerfile = / + basename + .h;
+   project_header = creditspath + headerfile;
+   }
+
if (FSO.FileExists(project_header)) {
if (header = FSO.OpenTextFile(project_header, 1)) {
contents = header.ReadAll();



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-31 Thread Pierre Joye 
Hi Steph,

On Mon, Mar 31, 2008 at 11:17 AM, Steph Fox [EMAIL PROTECTED] wrote:
 sfoxMon Mar 31 09:17:25 2008 UTC

   Modified files:  (Branch: PHP_5_3)
 /php-src/win32/buildconfutils.js
   Log:
   - Allow most of the existing strangely-named headers to get by

  
 http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.8r2=1.60.2.1.2.8.2.9diff_format=u
  Index: php-src/win32/build/confutils.js
  diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.8 
 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9
  --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.8   Mon Mar 24 15:11:46 
 2008
  +++ php-src/win32/build/confutils.jsMon Mar 31 09:17:25 2008
  @@ -17,7 +17,7 @@
+--+
   */

  -// $Id: confutils.js,v 1.60.2.1.2.8.2.8 2008/03/24 15:11:46 sfox Exp $
  +// $Id: confutils.js,v 1.60.2.1.2.8.2.9 2008/03/31 09:17:25 sfox Exp $

   var STDOUT = WScript.StdOut;
   var STDERR = WScript.StdErr;
  @@ -846,6 +846,7 @@
 var debug = ;
 var project_url = http://www.php.net;;
 var project_header = creditspath + /php_ + basename + .h;
  +   var headerfile = ;
 var versioning = ;

 if (sapi) {
  @@ -871,9 +872,22 @@
 }

 if (creditspath.match(new RegExp(pecl))) {
  +   /* PECL project url */
 project_url = http://pecl.php.net/; + basename;

Any chance to have http://pecl.php.net/; as a configuration option
(not configure but per build or via config.w32/package.xml)? I can
imagine one providing an external PHP extension channel.

 /* keep independent versioning PECL-specific for now */
  +   if (!FSO.FileExists(project_header)) { /* pick up a dozen 
 renegades */
  +   if (basename == doublemetaphone) headerfile = 
 /double_metaphone.h;
  +   if (basename == flitetts) headerfile = 
 /php_flite.h;
  +   if (basename == gopher) headerfile = 
 /gopher_fopen_wrapper.h;
  +   if (basename == ingres) headerfile = /php_ii.h;
  +   if (basename == iisfunc || basename == ixsfunc) 
 headerfile = /setup.h;
  +   if (basename == satellite) headerfile = 
 /php_orbit.h;
  +   if (basename == stats) headerfile = 
 /php_statistics.h;
  +   if (!headerfile) headerfile = / + basename + .h;
  +   project_header = creditspath + headerfile;
  +   }
  +

That's really too hackisch and unclean. Using GREP_HEADER (line 738)
together with a glob(*.h) would work in any case and will be generic
enough to do not have to worry about such static tests.

Cheers,
-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-31 Thread Steph Fox 

Hi Pierre,


That's really too hackisch and unclean.


I'm very aware of that - it's a temporary measure to avoid the need for new 
headers in 7 extensions.



Using GREP_HEADER (line 738)
together with a glob(*.h) would work in any case and will be generic
enough to do not have to worry about such static tests.


You obviously don't realize it, but GREP_HEADER's never worked - and the 
last time I tried to fix it my patch apparently broke the build for Edin! 
(No idea how, it worked fine here.) That said - I'll look into it when I get 
time, it's on my TODO anyway.


Thanks,

- Steph 



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-31 Thread Pierre Joye 
On Mon, Mar 31, 2008 at 1:11 PM, Steph Fox [EMAIL PROTECTED] wrote:
 Hi Pierre,


   That's really too hackisch and unclean.

  I'm very aware of that - it's a temporary measure to avoid the need for new
  headers in 7 extensions.


   Using GREP_HEADER (line 738)
   together with a glob(*.h) would work in any case and will be generic
   enough to do not have to worry about such static tests.

  You obviously don't realize it, but GREP_HEADER's never worked - and the
  last time I tried to fix it my patch apparently broke the build for Edin!
  (No idea how, it worked fine here.) That said - I'll look into it when I get
  time, it's on my TODO anyway.

Last time I used it it works, so yes, fixing it is obviously way
better than your current work around :)

Cheers,
-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-24 Thread Steph Fox 
sfoxMon Mar 24 15:11:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  Another thing version_compare() allows...
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.7r2=1.60.2.1.2.8.2.8diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.7 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.8
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.7   Sun Mar 23 21:59:31 2008
+++ php-src/win32/build/confutils.jsMon Mar 24 15:11:46 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.7 2008/03/23 21:59:31 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.8 2008/03/24 15:11:46 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -878,7 +878,7 @@
if (header = FSO.OpenTextFile(project_header, 1)) {
contents = header.ReadAll();
/* allowed: x.x.x[a|b|-alpha|-beta][RCx][-dev] 
*/
-   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)((a|b)\\d|\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)')))
 {
+   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)((a|b)(\\d)?|\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)')))
 {
project_version = RegExp.$2;
file_version = RegExp.$3.split('.');
if (!file_version[2]) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-23 Thread Steph Fox 
sfoxSun Mar 23 21:59:31 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - Extend that regexp (again)
  - Revert the changes affecting external template.rc files
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.6r2=1.60.2.1.2.8.2.7diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.6 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.7
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.6   Sat Mar 22 22:16:55 2008
+++ php-src/win32/build/confutils.jsSun Mar 23 21:59:31 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.6 2008/03/22 22:16:55 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.7 2008/03/23 21:59:31 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -839,6 +839,7 @@
 {
var resname = makefiletarget + .res;
var res_desc = makefiletarget;
+   var res_prod_name = PHP  + makefiletarget;
var credits;
var thanks = ;
var logo = ;
@@ -876,8 +877,8 @@
if (FSO.FileExists(project_header)) {
if (header = FSO.OpenTextFile(project_header, 1)) {
contents = header.ReadAll();
-   /* allowed: x.x.x[-dev|-alpha|-beta][RCx] */
-   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)'))) {
+   /* allowed: x.x.x[a|b|-alpha|-beta][RCx][-dev] 
*/
+   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)((a|b)\\d|\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)')))
 {
project_version = RegExp.$2;
file_version = RegExp.$3.split('.');
if (!file_version[2]) {
@@ -903,12 +904,10 @@
 */
if (FSO.FileExists(creditspath + '\\template.rc')) {
MFO.WriteLine($(BUILD_DIR)\\ + resname + :  + creditspath + 
\\template.rc);
-   MFO.WriteLine(\t$(RC) /n /fo $(BUILD_DIR)\\ + resname + logo 
+ debug +
-   ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d 
FILE_NAME=\\'
-   + makefiletarget + '\\ /d URL=\\' + project_url
-   + '\\ /d INTERNAL_NAME=\\' + internal_name + 
versioning + 
-   '\\ /d THANKS_GUYS=\\' + thanks + '\\ ' + 
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;
}
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js template.rc

2008-03-22 Thread Steph Fox 
sfoxSat Mar 22 09:07:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js template.rc 
  Log:
  Independent versioning for PECL extensions (and only PECL, for now)
  This affects the RC template used to ship information with the DLL in Windows 
distributions - nothing else.
  It will potentially affect 13 PECL modules at present (and yes I do know 
which ones!)
  http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.3r2=1.60.2.1.2.8.2.4diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.3 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.4
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.3   Sun Feb 17 01:26:15 2008
+++ php-src/win32/build/confutils.jsSat Mar 22 09:07:59 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.3 2008/02/17 01:26:15 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.4 2008/03/22 09:07:59 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -835,14 +835,23 @@
 /* emits rule to generate version info for a SAPI
  * or extension.  Returns the name of the .res file
  * that will be generated */
-function generate_version_info_resource(makefiletarget, creditspath)
+function generate_version_info_resource(makefiletarget, basename, creditspath, 
sapi)
 {
var resname = makefiletarget + .res;
-   var res_desc = PHP  + makefiletarget;
-   var res_prod_name = res_desc;
+   var res_desc = makefiletarget;
var credits;
var thanks = ;
var logo = ;
+   var debug = ;
+   var project_url = http://www.php.net;;
+   var project_header = creditspath + /php_ + basename + .h;
+   var versioning = ;
+
+   if (sapi) {
+   var internal_name = basename.toUpperCase() +  SAPI;
+   } else {
+   var internal_name = basename.toUpperCase() +  extension;
+   }
 
if (FSO.FileExists(creditspath + '/CREDITS')) {
credits = FSO.OpenTextFile(creditspath + '/CREDITS', 1);
@@ -860,8 +869,30 @@
credits.Close();
}
 
+   if (creditspath.match(new RegExp(pecl))) {
+   project_url = http://pecl.php.net/; + basename;
+
+   /* keep independent versioning PECL-specific for now */
+   if (FSO.FileExists(project_header)) {
+   if (header = FSO.OpenTextFile(project_header, 1)) {
+   contents = header.ReadAll();
+   /* allowed: x.x.x[-dev|-alpha|-beta][RCx] */
+   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?)'))) {
+   project_version = RegExp.$2;
+   file_version = RegExp.$3.split('.');
+   versioning = '\\ /d 
EXT_FILE_VERSION=' + file_version[0] + ',' + file_version[1] + ',' + 
file_version[2] + ' /d EXT_VERSION=\\' + project_version;
+   }
+   header.Close();
+   }
+   }
+   }
+
if (makefiletarget.match(new RegExp(\\.exe$))) {
-   logo =  /D WANT_LOGO ;
+   logo =  /d WANT_LOGO ;
+   }
+
+   if (PHP_DEBUG != no) {
+   debug =  /d _DEBUG;
}
 
/**
@@ -869,20 +900,22 @@
 */
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');
+   MFO.WriteLine(\t$(RC) /n /fo $(BUILD_DIR)\\ + resname + logo 
+ debug +
+   ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d 
FILE_NAME=\\'
+   + makefiletarget + '\\ /d URL=\\' + project_url
+   + '\\ /d INTERNAL_NAME=\\' + internal_name + 
versioning + 
+   '\\ /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 +
-   '\\ /d PRODUCT_NAME=\\' + res_prod_name + '\\ /d 
THANKS_GUYS=\\' +
-   thanks + '\\ win32\\build\\template.rc');

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-22 Thread Steph Fox 
sfoxSat Mar 22 09:33:31 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  Allow Stas his 1.0.0RC1-dev
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.4r2=1.60.2.1.2.8.2.5diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.4 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.5
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.4   Sat Mar 22 09:07:59 2008
+++ php-src/win32/build/confutils.jsSat Mar 22 09:33:31 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.4 2008/03/22 09:07:59 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.5 2008/03/22 09:33:31 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -877,7 +877,7 @@
if (header = FSO.OpenTextFile(project_header, 1)) {
contents = header.ReadAll();
/* allowed: x.x.x[-dev|-alpha|-beta][RCx] */
-   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?)'))) {
+   if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)'))) {
project_version = RegExp.$2;
file_version = RegExp.$3.split('.');
versioning = '\\ /d 
EXT_FILE_VERSION=' + file_version[0] + ',' + file_version[1] + ',' + 
file_version[2] + ' /d EXT_VERSION=\\' + project_version;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-03-22 Thread Steph Fox 
sfoxSat Mar 22 22:16:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  Don't break PECL extensions that are oh-so-nearly doing The Right Thing [TM]
  (mcve, runkit, win32ps)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.5r2=1.60.2.1.2.8.2.6diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.5 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.6
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.5   Sat Mar 22 09:33:31 2008
+++ php-src/win32/build/confutils.jsSat Mar 22 22:16:55 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.5 2008/03/22 09:33:31 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.6 2008/03/22 22:16:55 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -880,6 +880,9 @@
if (contents.match(new RegExp('PHP_' + 
basename.toUpperCase() + 
'_VERSION(\\s+)((\\d+\.\\d+(\.\\d+)?)(\-[a-z]{3,5})?(RC\\d+)?(\-dev)?)'))) {
project_version = RegExp.$2;
file_version = RegExp.$3.split('.');
+   if (!file_version[2]) {
+   file_version[2] = 0;
+   }
versioning = '\\ /d 
EXT_FILE_VERSION=' + file_version[0] + ',' + file_version[1] + ',' + 
file_version[2] + ' /d EXT_VERSION=\\' + project_version;
}
header.Close();



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js

2008-02-16 Thread Pierre-Alain Joye 
pajoye  Sun Feb 17 01:26:15 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  - 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.60.2.1.2.8.2.2r2=1.60.2.1.2.8.2.3diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.3
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2   Thu Jan 10 18:21:56 2008
+++ php-src/win32/build/confutils.jsSun Feb 17 01:26:15 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.2 2008/01/10 18:21:56 rrichards Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.3 2008/02/17 01:26:15 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(PHP_5_3) /win32/build confutils.js

2008-01-10 Thread Rob Richards 
rrichards   Thu Jan 10 18:21:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  MFH: add errors when missing dependencies (Steph)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.1r2=1.60.2.1.2.8.2.2diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1   Wed Nov 14 19:38:57 2007
+++ php-src/win32/build/confutils.jsThu Jan 10 18:21:56 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.1 2007/11/14 19:38:57 auroraeosrose Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.2 2008/01/10 18:21:56 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(PHP_5_3) /win32/build confutils.js

2007-11-14 Thread Elizabeth Marie Smith 
auroraeosrose   Wed Nov 14 19:38:57 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js 
  Log:
  Allow passing additional configuration parameters to config.nice.bat
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8r2=1.60.2.1.2.8.2.1diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1
--- php-src/win32/build/confutils.js:1.60.2.1.2.8   Thu Jul 26 22:45:59 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:38:57 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.1 2007/11/14 19:38:57 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