[PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js

[Kalle Sommer Nielsen]

kalleMon, 13 Dec 2010 20:46:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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

Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js

[Pierre Joye]

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 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js

[Pierre Joye]

pajoye   Mon, 13 Dec 2010 20:56:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306348

Log:
- no need to diplay that

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 20:55:13 UTC (rev 
306347)
+++ php/php-src/trunk/win32/build/confutils.js  2010-12-13 20:56:44 UTC (rev 
306348)
@@ -1516,11 +1516,6 @@

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);

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

[PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js

[Derick Rethans]

derick   Sat, 25 Jul 2009 15:51:16 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286312

Log:
- MF53: Added - to the list of unsafe characters so that the pecl dir can
  have the - character in the name.

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  2009-07-25 15:51:02 UTC (rev 
286311)
+++ php/php-src/trunk/win32/build/confutils.js  2009-07-25 15:51:16 UTC (rev 
286312)
@@ -1291,12 +1291,12 @@
 * as either a child or a sibling */
if (obj_dir == null) {
var build_dir = dir.replace(new RegExp(^..), );
-   var mangle_dir = build_dir.replace(new RegExp([/.], g), 
_);
+   var mangle_dir = build_dir.replace(new RegExp([/.-], 
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
else {
var build_dir = obj_dir.replace(new RegExp(^..), );
-   var mangle_dir = build_dir.replace(new RegExp([/.], g), 
_);
+   var mangle_dir = build_dir.replace(new RegExp([/.-], 
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}


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