[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/win32/build/ confutils.js
derick Sat, 25 Jul 2009 15:51:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286311
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/branches/PHP_5_2/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_2/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:18:19 UTC (rev 286310)
+++ php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:51:02 UTC (rev 286311)
@@ -1150,12 +1150,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
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/win32/build/ confutils.js
hi,
Thanks for this fix :)
Please try to commit in all branches at once (don't forget to merge to 5.3).
Cheers,
On Sat, Jul 25, 2009 at 5:51 PM, Derick Rethansder...@php.net wrote:
derick Sat, 25 Jul 2009 15:51:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286311
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/branches/PHP_5_2/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_2/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:18:19 UTC (rev 286310)
+++ php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:51:02 UTC (rev 286311)
@@ -1150,12 +1150,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
--
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] svn: /php/php-src/branches/PHP_5_2/win32/build/ confutils.js
On Sat, 25 Jul 2009, Pierre Joye wrote: Thanks for this fix :) Please try to commit in all branches at once (don't forget to merge to 5.3). I added it to 5.3 some days ago already. regards, Derick -- http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org twitter: @derickr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/build/
pajoye Wed, 15 Jul 2009 17:09:19 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284137
Changed paths:
U php/php-src/branches/PHP_5_2/win32/build/buildconf.js
Log:
- cvs svn
Modified: php/php-src/branches/PHP_5_2/win32/build/buildconf.js
===
--- php/php-src/branches/PHP_5_2/win32/build/buildconf.js 2009-07-15 17:08:50 UTC (rev 284136)
+++ php/php-src/branches/PHP_5_2/win32/build/buildconf.js 2009-07-15 17:09:19 UTC (rev 284137)
@@ -1,254 +1,254 @@
-/*
- +--+
- | PHP Version 5|
- +--+
- | Copyright (c) 1997-2007 The PHP Group|
- +--+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is|
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@php.net so we can mail you a copy immediately. |
- +--+
- | Author: Wez Furlong w...@thebrainroom.com |
- +--+
-*/
-
-/* $Id: buildconf.js,v 1.13.2.2.2.2 2009-01-03 03:27:47 kalle Exp $ */
-// This generates a configure script for win32 build
-
-WScript.StdOut.WriteLine(Rebuilding configure.js);
-var FSO = WScript.CreateObject(Scripting.FileSystemObject);
-var C = FSO.CreateTextFile(configure.js, true);
-
-var modules = ;
-var MODULES = WScript.CreateObject(Scripting.Dictionary);
-var module_dirs = new Array();
-
-function file_get_contents(filename)
-{
- var F = FSO.OpenTextFile(filename, 1);
- var t = F.ReadAll();
- F.Close();
- return t;
-}
-
-function Module_Item(module_name, config_path, dir_line, deps, content)
-{
- this.module_name = module_name;
- this.config_path = config_path;
- this.dir_line = dir_line;
- this.deps = deps;
- this.content = content;
-}
-
-function find_config_w32(dirname)
-{
- if (!FSO.FolderExists(dirname)) {
- return;
- }
-
- var f = FSO.GetFolder(dirname);
- var fc = new Enumerator(f.SubFolders);
- var c, i, ok, n;
- var item = null;
- var re_dep_line = new RegExp(ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\]([^'\]+)['\].*\\);, gm);
-
- for (; !fc.atEnd(); fc.moveNext())
- {
- ok = true;
- /* check if we already picked up a module with the same dirname;
- * if we have, don't include it here */
- n = FSO.GetFileName(fc.item());
-
- if (n == 'CVS' || n == 'tests')
- continue;
-
- // WScript.StdOut.WriteLine(checking + dirname + / + n);
- if (MODULES.Exists(n)) {
- WScript.StdOut.WriteLine(Skipping + dirname + / + n + -- already have a module with that name);
- continue;
- }
-
-
- c = FSO.BuildPath(fc.item(), config.w32);
- if (FSO.FileExists(c)) {
-// WScript.StdOut.WriteLine(c);
-
- var dir_line = configure_module_dirname = condense_path(FSO.GetParentFolderName('
- + c.replace(new RegExp('([])', g), '\\$1') + '));\r\n;
- var contents = file_get_contents(c);
- var deps = new Array();
-
- // parse out any deps from the file
- var calls = contents.match(re_dep_line);
- if (calls != null) {
-for (i = 0; i calls.length; i++) {
- // now we need the extension name out of this thing
- if (calls[i].match(re_dep_line)) {
-// WScript.StdOut.WriteLine(n depends on + RegExp.$1);
- deps[deps.length] = RegExp.$1;
- }
-}
- }
-
- item = new Module_Item(n, c, dir_line, deps, contents);
- MODULES.Add(n, item);
- }
- }
-}
-
-// Emit core modules array. This is used by a snapshot
-// build to override a default yes value so that external
-// modules don't break the build by becoming statically compiled
-function emit_core_module_list()
-{
- var module_names = (new VBArray(MODULES.Keys())).toArray();
- var i, mod_name, j;
- var item;
- var output = ;
-
- C.WriteLine(core_module_list = new Array();
-
- // first, look for modules with empty deps; emit those first
- for (i in module_names) {
- mod_name = module_names[i];
- C.WriteLine(\ + mod_name.replace(/_/g, -) + \,);
- }
-
- C.WriteLine(false // dummy);
-
- C.WriteLine(););
-}
-
-
-function emit_module(item)
-{
- return item.dir_line + item.content;
-}
-
-function emit_dep_modules(module_names)
-{
- var i, mod_name, j;
- var output = ;
- var item = null;
-
- for (i in module_names) {
- mod_name = module_names[i];
-
- if (MODULES.Exists(mod_name)) {
- item = MODULES.Item(mod_name);
- MODULES.Remove(mod_name);
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/build/
dsp Mon, 13 Jul 2009 06:42:59 + ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=283996 Changed paths: U php/php-src/branches/PHP_5_2/win32/build/buildconf.js Log: MFB: remove ZendEngine* detection, we always have Zend now (svn) Modified: php/php-src/branches/PHP_5_2/win32/build/buildconf.js === (Binary files differ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/build/
pajoye Mon, 13 Jul 2009 16:01:40 +
ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=284011
Changed paths:
U php/php-src/branches/PHP_5_2/win32/build/cvsclean.js
U php/php-src/branches/PHP_5_2/win32/build/mkdist.php
Log:
- cvs to svn changes
Modified: php/php-src/branches/PHP_5_2/win32/build/cvsclean.js
===
(Binary files differ)
Modified: php/php-src/branches/PHP_5_2/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_2/win32/build/mkdist.php 2009-07-13 15:16:20 UTC
(rev 284010)
+++ php/php-src/branches/PHP_5_2/win32/build/mkdist.php 2009-07-13 16:01:40 UTC
(rev 284011)
@@ -240,7 +240,7 @@
}
/* include a snapshot identifier */
-$branch = HEAD; // TODO - determine this from CVS/Entries
+$branch = HEAD; // TODO - determine this from SVN branche name
$fp = fopen($dist_dir/snapshot.txt, w);
$now = date(r);
$version = phpversion();
@@ -319,7 +319,7 @@
$d = opendir($source);
while (($f = readdir($d)) !== false) {
- if ($f == '.' || $f == '..' || $f == 'CVS') {
+ if ($f == '.' || $f == '..' || $f == '.svn') {
continue;
}
$fs = $source . '/' . $f;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/build/
pajoye Mon, 13 Jul 2009 16:09:39 + ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=284016 Changed paths: A php/php-src/branches/PHP_5_2/win32/build/svnclean.js Log: - rename to svn Copied: php/php-src/branches/PHP_5_2/win32/build/svnclean.js (from rev 284011, php/php-src/branches/PHP_5_2/win32/build/cvsclean.js) === (Binary files differ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/build/
pajoye Mon, 13 Jul 2009 22:01:21 + ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=284028 Changed paths: _U php/php-src/branches/PHP_5_2/win32/build/buildconf.js _U php/php-src/branches/PHP_5_2/win32/build/confutils.js _U php/php-src/branches/PHP_5_2/win32/build/svnclean.js Log: - remove app/js mime Property changes on: php/php-src/branches/PHP_5_2/win32/build/buildconf.js ___ Deleted: svn:mime-type - application/javascript Property changes on: php/php-src/branches/PHP_5_2/win32/build/confutils.js ___ Deleted: svn:mime-type - application/javascript Property changes on: php/php-src/branches/PHP_5_2/win32/build/svnclean.js ___ Deleted: svn:mime-type - application/javascript -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
