pls don't touch this code for now, and not in trunk I will merge the
changes from 5.3 soon. Thanks :)

On Mon, Dec 13, 2010 at 9:46 PM, Kalle Sommer Nielsen <ka...@php.net> wrote:
> kalle                                    Mon, 13 Dec 2010 20:46:57 +0000
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=306346
>
> Log:
> * Don't print the shared headers table after enabling each extension (cleaner 
> configure output)
> * Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
>
> Changed paths:
>    U   php/php-src/trunk/win32/build/confutils.js
>
> Modified: php/php-src/trunk/win32/build/confutils.js
> ===================================================================
> --- php/php-src/trunk/win32/build/confutils.js  2010-12-13 18:45:53 UTC (rev 
> 306345)
> +++ php/php-src/trunk/win32/build/confutils.js  2010-12-13 20:46:57 UTC (rev 
> 306346)
> @@ -1475,6 +1475,11 @@
>
>        STDOUT.WriteBlankLines(2);
>
> +
> +       STDOUT.WriteLine("Shared headers:");
> +       output_as_table(["Headers", "Type", "target"], headers_install);
> +       STDOUT.WriteBlankLines(2);
> +
>        STDOUT.WriteLine("Enabled extensions:");
>        output_as_table(["Extension", "Mode"], extensions_enabled.sort());
>        STDOUT.WriteBlankLines(2);
> @@ -1867,7 +1872,7 @@
>  {
>        headers_list = headers_list.split(new RegExp("\\s+"));
>        headers_list.sort();
> -       if (dir.length > 0 && dir.substr(dir.length - 1) != '/') {
> +       if (dir.length > 0 && dir.substr(dir.length - 1) != '/' && 
> dir.substr(dir.length - 1) != '\\') {
>                dir += '/';
>        }
>        dir = dir.replace(new RegExp("/", "g"), "\\");
> @@ -1878,7 +1883,7 @@
>                isdir = FSO.FolderExists(dir + src);
>                isfile = FSO.FileExists(dir + src);
>                if (isdir) {
> -                       if (src.length > 0 && src.substr(src.length - 1) != 
> '/') {
> +                       if (src.length > 0 && src.substr(src.length - 1) != 
> '/' && src.substr(src.length - 1) != '\\') {
>                                src += '\\';
>                        }
>                        headers_install[headers_install.length] = [dir + src, 
> 'dir',''];
> @@ -1892,7 +1897,6 @@
>                        ERROR("Cannot find header " + dir + src);
>                }
>        }
> -       output_as_table(["Headers", "Type", "target"], headers_install);
>  }
>
>  // for snapshot builders, this option will attempt to enable everything
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>



-- 
Pierre

@pierrejoye | 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