Hi Steph,

On Mon, Mar 31, 2008 at 11:17 AM, Steph Fox <[EMAIL PROTECTED]> wrote:
> sfox            Mon Mar 31 09:17:25 2008 UTC
>
>   Modified files:              (Branch: PHP_5_3)
>     /php-src/win32/build        confutils.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.8&r2=1.60.2.1.2.8.2.9&diff_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.js    Mon 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

Reply via email to