[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/win32/ php_stdint.h
pajoye Thu, 01 Apr 2010 10:52:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=297265 Log: - add it to 5.2 too, cannot hurt and will spare some work later with pcreco Changed paths: A php/php-src/branches/PHP_5_2/win32/php_stdint.h Added: php/php-src/branches/PHP_5_2/win32/php_stdint.h === --- php/php-src/branches/PHP_5_2/win32/php_stdint.h (rev 0) +++ php/php-src/branches/PHP_5_2/win32/php_stdint.h 2010-04-01 10:52:28 UTC (rev 297265) @@ -0,0 +1,251 @@ +// ISO C9x compliant stdint.h for Microsoft Visual Studio +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 +// +// Copyright (c) 2006-2009 Alexander Chemeris +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The name of the author may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +/// + +#ifndef _MSC_VER // [ +#error Use this header only with Microsoft Visual C++ compilers! +#endif // _MSC_VER ] + +#ifndef _MSC_STDINT_H_ // [ +#define _MSC_STDINT_H_ + +#if _MSC_VER 1000 +#pragma once +#endif + +#include limits.h + +// For Visual Studio 6 in C++ mode wrap wchar.h include with 'extern C++ {}' +// or compiler give many errors like this: +// error C2733: second C linkage of overloaded function 'wmemchr' not allowed +#if (_MSC_VER 1300) defined(__cplusplus) + extern C++ { +#endif +# include wchar.h +#if (_MSC_VER 1300) defined(__cplusplus) + } +#endif + +// Define _W64 macros to mark types changing their size, like intptr_t. +#ifndef _W64 +# if !defined(__midl) (defined(_X86_) || defined(_M_IX86)) _MSC_VER = 1300 +# define _W64 __w64 +# else +# define _W64 +# endif +#endif + + +// 7.18.1 Integer types + +// 7.18.1.1 Exact-width integer types +typedef __int8int8_t; +typedef __int16 int16_t; +#ifndef int32_t +typedef __int32 int32_t; +#endif +#ifndef int64_t +typedef __int64 int64_t; +#endif +#ifndef uint8_t +typedef unsigned __int8 uint8_t; +#endif +#ifndef u_char +typedef unsigned __int8 u_char; +#endif +typedef unsigned __int16 uint16_t; +#ifndef uint32_t +typedef unsigned __int32 uint32_t; +#endif +typedef unsigned __int64 uint64_t; + +// 7.18.1.2 Minimum-width integer types +typedef int8_tint_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +typedef int64_t int_least64_t; +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +typedef uint64_t uint_least64_t; + +// 7.18.1.3 Fastest minimum-width integer types +typedef int8_tint_fast8_t; +typedef int16_t int_fast16_t; +typedef int32_t int_fast32_t; +typedef int64_t int_fast64_t; +typedef uint8_t uint_fast8_t; +typedef uint16_t uint_fast16_t; +typedef uint32_t uint_fast32_t; +typedef uint32_t u_int32_t; +typedef uint64_t uint_fast64_t; + +// 7.18.1.4 Integer types capable of holding object pointers +#ifdef _WIN64 // [ + typedef __int64 intptr_t; + typedef unsigned __int64 uintptr_t; +#else // _WIN64 ][ + typedef _W64 int intptr_t; + typedef _W64 unsigned int uintptr_t; +#endif // _WIN64 ] + +// 7.18.1.5 Greatest-width integer types +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; + + +// 7.18.2 Limits of specified-width integer types + +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 + +// 7.18.2.1 Limits of exact-width integer types +#define INT8_MIN
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/win32/sendmail.c branches/PHP_5_2/win32/sendmail.h branches/PHP_5_3/win32/sendmail.c branches/PHP_5_3/win32/sendmail.h trunk/win32/sendmail.c trunk/win32/
pajoye Wed, 26 Aug 2009 21:59:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287783 Log: - silent warning (fix for #28038) Bug: http://bugs.php.net/28038 (Closed) Sent incorrect RCPT TO commands to SMTP server Changed paths: U php/php-src/branches/PHP_5_2/win32/sendmail.c U php/php-src/branches/PHP_5_2/win32/sendmail.h U php/php-src/branches/PHP_5_3/win32/sendmail.c U php/php-src/branches/PHP_5_3/win32/sendmail.h U php/php-src/trunk/win32/sendmail.c U php/php-src/trunk/win32/sendmail.h Modified: php/php-src/branches/PHP_5_2/win32/sendmail.c === --- php/php-src/branches/PHP_5_2/win32/sendmail.c 2009-08-26 20:58:06 UTC (rev 287782) +++ php/php-src/branches/PHP_5_2/win32/sendmail.c 2009-08-26 21:59:54 UTC (rev 287783) @@ -937,7 +937,7 @@ // Author/Date: garretts 08/18/2009 // History: /// -int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ) { +static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString) { char *tmpAddress1, *tmpAddress2; int result; Modified: php/php-src/branches/PHP_5_2/win32/sendmail.h === --- php/php-src/branches/PHP_5_2/win32/sendmail.h 2009-08-26 20:58:06 UTC (rev 287782) +++ php/php-src/branches/PHP_5_2/win32/sendmail.h 2009-08-26 21:59:54 UTC (rev 287783) @@ -47,4 +47,5 @@ static int Post(LPCSTR msg); static int Ack(char **server_response); static unsigned long GetAddr(LPSTR szHost); +static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString); #endif /* sendmail_h */ Modified: php/php-src/branches/PHP_5_3/win32/sendmail.c === --- php/php-src/branches/PHP_5_3/win32/sendmail.c 2009-08-26 20:58:06 UTC (rev 287782) +++ php/php-src/branches/PHP_5_3/win32/sendmail.c 2009-08-26 21:59:54 UTC (rev 287783) @@ -975,7 +975,7 @@ // Author/Date: garretts 08/18/2009 // History: /// -int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString ) { +static int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString) { char *tmpAddress1, *tmpAddress2; int result; Modified: php/php-src/branches/PHP_5_3/win32/sendmail.h === --- php/php-src/branches/PHP_5_3/win32/sendmail.h 2009-08-26 20:58:06 UTC (rev 287782) +++ php/php-src/branches/PHP_5_3/win32/sendmail.h 2009-08-26 21:59:54 UTC (rev 287783) @@ -47,4 +47,5 @@ static int Post(LPCSTR msg); static int Ack(char **server_response); static unsigned long GetAddr(LPSTR szHost); +static int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString); #endif /* sendmail_h */ Modified: php/php-src/trunk/win32/sendmail.c === --- php/php-src/trunk/win32/sendmail.c 2009-08-26 20:58:06 UTC (rev 287782) +++ php/php-src/trunk/win32/sendmail.c 2009-08-26 21:59:54 UTC (rev 287783) @@ -975,7 +975,7 @@ // Author/Date: garretts 08/18/2009 // History: /// -int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ) { +static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ) { char *tmpAddress1, *tmpAddress2; int result; Modified: php/php-src/trunk/win32/sendmail.h === --- php/php-src/trunk/win32/sendmail.h 2009-08-26 20:58:06 UTC (rev 287782) +++ php/php-src/trunk/win32/sendmail.h 2009-08-26 21:59:54 UTC (rev 287783) @@ -47,4 +47,5 @@ static int Post(LPCSTR msg); static int Ack(char **server_response); static unsigned long GetAddr(LPSTR szHost); +static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ); #endif /* sendmail_h */ -- 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/ 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
Re: [PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/
On Sat, 2009-07-11 at 14:16 +0200, Pierre Joye wrote: hi, Would it not be easier to reverse the process? We can use rest data and convert them to either docbook (do we have a rest docbook converter?) or html. If we create a new INSTALL file it should be short and mostly point to php.net/install in my opinion. I doubt such a lengthy file as it is now can really be used. johannes -- 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/
2009/7/12 Johannes Schlüter johan...@schlueters.de: On Sat, 2009-07-11 at 14:16 +0200, Pierre Joye wrote: hi, Would it not be easier to reverse the process? We can use rest data and convert them to either docbook (do we have a rest docbook converter?) or html. If we create a new INSTALL file it should be short and mostly point to php.net/install in my opinion. I doubt such a lengthy file as it is now can really be used. Sorry, I was not clear. What I'm suggesting is to keep this file and generate www.php.net/install using it, not the other way 'round. 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] svn: php/php-src/branches/PHP_5_2/win32/
2009/7/12 Pierre Joye pierre@gmail.com: 2009/7/12 Johannes Schlüter johan...@schlueters.de: On Sat, 2009-07-11 at 14:16 +0200, Pierre Joye wrote: hi, Would it not be easier to reverse the process? We can use rest data and convert them to either docbook (do we have a rest docbook converter?) or html. If we create a new INSTALL file it should be short and mostly point to php.net/install in my opinion. I doubt such a lengthy file as it is now can really be used. Sorry, I was not clear. What I'm suggesting is to keep this file and generate www.php.net/install using it, not the other way 'round. I agree with Johannes. Having a lengthy INSTALL file which covers all possible platforms and weirdness is quite useless today. This info should be in the online docs, but the shipped INSTALL file should IMO only contain 20lines and then a link for more info see php.net/install. -Hannes -- 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/
Just FYI, this file (and php-src/INSTALL) used to be generated automatically from phpdoc sources. I used to do this myself, but I haven't done it for quite some time now, so I don't know what's the status. Does anyone knows? Nuno - Original Message - rasmus Sat, 11 Jul 2009 04:14:29 + ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=283787 Changed paths: U php/php-src/branches/PHP_5_2/win32/install.txt Log: Test commit - but pseudo useful Modified: php/php-src/branches/PHP_5_2/win32/install.txt === --- php/php-src/branches/PHP_5_2/win32/install.txt 2009-07-11 02:47:38 UTC (rev 283786) +++ php/php-src/branches/PHP_5_2/win32/install.txt 2009-07-11 04:14:29 UTC (rev 283787) @@ -883,7 +883,7 @@ http://snaps.php.net/php5-latest.tar.gz or download binaries for Windows http://snaps.php.net/win32/php5-win32-latest.zip. * a prerelease version downloadable from http://qa.php.net/. - * you have always the option to obtain PHP through anonymous CVS. + * you have always the option to obtain PHP through SVN. These versions of PHP are compatible to Apache 2.0.40 and later. @@ -1428,8 +1428,8 @@ When building PHP modules, it's important to have known-good versions of the required tools (autoconf, automake, libtool, etc.) See the - Anonymous CVS Instructions for details on the required tools, and - required versions. + SVN Instructions for details on the required tools, and required + versions. __ Downloading PECL extensions @@ -1445,14 +1445,12 @@ PECL extensions that have releases listed on the PECL web site are available for download and installation using the pecl command. Specific revisions may also be specified. - * CVS - Most PECL extensions also reside in CVS. A web-based view may be - seen at http://cvs.php.net/pecl/. To download straight from CVS, - the following sequence of commands may be used. Note that phpfi is - the password for user cvsread: + * SVN + Most PECL extensions also reside in SVN. A web-based view may be + seen at http://svn.php.net/pecl/. To download straight from SVN, + the following sequence of commands may be used. -$ cvs -d:pserver:cvsr...@cvs.php.net:/repository login -$ cvs -d:pserver:cvsr...@cvs.php.net:/repository co pecl/extname +$ svn co http://svn.php.net/repository/pecl/extname/trunk * Windows downloads Windows users may find compiled PECL binaries by downloading the @@ -1500,7 +1498,7 @@ Sometimes, using the pecl installer is not an option. This could be because you're behind a firewall, or it could be because the extension you want to install is not available as a PECL compatible package, such - as unreleased extensions from CVS. If you need to build such an + as unreleased extensions from SVN. If you need to build such an extension, you can use the lower-level build tools to perform the build manually. @@ -1647,7 +1645,7 @@ directives are documented in the manual though. For a complete list of directives available in your PHP version, please read your well commented php.ini file. Alternatively, you may find the the latest - php.ini from CVS helpful too. + php.ini from SVN helpful too. Example 5-1. php.ini example ; any text on a line after an unquoted semicolon (;) is ignored -- 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/
On Sat, Jul 11, 2009 at 13:14, Nuno Lopesnlop...@php.net wrote: Just FYI, this file (and php-src/INSTALL) used to be generated automatically from phpdoc sources. I used to do this myself, but I haven't done it for quite some time now, so I don't know what's the status. Does anyone knows? Nope. We found out, just before the 5.3.0 release, that it was very very outofdate but couldnt figureout how to generate it so Johannes made some 'manual changes' to it. -Hannes -- 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/
On Sat, Jul 11, 2009 at 13:14, Nuno Lopesnlop...@php.net wrote: Just FYI, this file (and php-src/INSTALL) used to be generated automatically from phpdoc sources. I used to do this myself, but I haven't done it for quite some time now, so I don't know what's the status. Does anyone knows? Nope. We found out, just before the 5.3.0 release, that it was very very outofdate but couldnt figureout how to generate it so Johannes made some 'manual changes' to it. Ok, so let me summarize how it used to work: First we generated a .html file that included the whole install + install faq sections of the manual (with openjade at the time :). Then we used lynx to produce the .txt file out of the .html file. The difference between INSTALL and install.txt was the included sections. We excluded non-interesting sections from the souce .xmls files before generating the html. In the old phpdoc/Makefile.in you can find this: %.txt: %.html lynx -nolist -dump file:`pwd`/$ $@ And the source .xml files can still be found in CVS: http://cvs.php.net/viewvc.cgi/phpdoc/install-unix.xml?view=markup http://cvs.php.net/viewvc.cgi/phpdoc/install-win.xml?view=markup Nuno -- 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/
hi, Would it not be easier to reverse the process? We can use rest data and convert them to either docbook (do we have a rest docbook converter?) or html. cheers, On Sat, Jul 11, 2009 at 1:34 PM, Nuno Lopesnlop...@php.net wrote: On Sat, Jul 11, 2009 at 13:14, Nuno Lopesnlop...@php.net wrote: Just FYI, this file (and php-src/INSTALL) used to be generated automatically from phpdoc sources. I used to do this myself, but I haven't done it for quite some time now, so I don't know what's the status. Does anyone knows? Nope. We found out, just before the 5.3.0 release, that it was very very outofdate but couldnt figureout how to generate it so Johannes made some 'manual changes' to it. Ok, so let me summarize how it used to work: First we generated a .html file that included the whole install + install faq sections of the manual (with openjade at the time :). Then we used lynx to produce the .txt file out of the .html file. The difference between INSTALL and install.txt was the included sections. We excluded non-interesting sections from the souce .xmls files before generating the html. In the old phpdoc/Makefile.in you can find this: %.txt: %.html lynx -nolist -dump file:`pwd`/$ $@ And the source .xml files can still be found in CVS: http://cvs.php.net/viewvc.cgi/phpdoc/install-unix.xml?view=markup http://cvs.php.net/viewvc.cgi/phpdoc/install-win.xml?view=markup Nuno -- 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
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/win32/
rasmus Sat, 11 Jul 2009 04:14:29 + ViewVC URL: http://svn.php.net/viewvc?view=revisionrevision=283787 Changed paths: U php/php-src/branches/PHP_5_2/win32/install.txt Log: Test commit - but pseudo useful Modified: php/php-src/branches/PHP_5_2/win32/install.txt === --- php/php-src/branches/PHP_5_2/win32/install.txt 2009-07-11 02:47:38 UTC (rev 283786) +++ php/php-src/branches/PHP_5_2/win32/install.txt 2009-07-11 04:14:29 UTC (rev 283787) @@ -883,7 +883,7 @@ http://snaps.php.net/php5-latest.tar.gz or download binaries for Windows http://snaps.php.net/win32/php5-win32-latest.zip. * a prerelease version downloadable from http://qa.php.net/. - * you have always the option to obtain PHP through anonymous CVS. + * you have always the option to obtain PHP through SVN. These versions of PHP are compatible to Apache 2.0.40 and later. @@ -1428,8 +1428,8 @@ When building PHP modules, it's important to have known-good versions of the required tools (autoconf, automake, libtool, etc.) See the - Anonymous CVS Instructions for details on the required tools, and - required versions. + SVN Instructions for details on the required tools, and required + versions. __ Downloading PECL extensions @@ -1445,14 +1445,12 @@ PECL extensions that have releases listed on the PECL web site are available for download and installation using the pecl command. Specific revisions may also be specified. - * CVS - Most PECL extensions also reside in CVS. A web-based view may be - seen at http://cvs.php.net/pecl/. To download straight from CVS, - the following sequence of commands may be used. Note that phpfi is - the password for user cvsread: + * SVN + Most PECL extensions also reside in SVN. A web-based view may be + seen at http://svn.php.net/pecl/. To download straight from SVN, + the following sequence of commands may be used. -$ cvs -d:pserver:cvsr...@cvs.php.net:/repository login -$ cvs -d:pserver:cvsr...@cvs.php.net:/repository co pecl/extname +$ svn co http://svn.php.net/repository/pecl/extname/trunk * Windows downloads Windows users may find compiled PECL binaries by downloading the @@ -1500,7 +1498,7 @@ Sometimes, using the pecl installer is not an option. This could be because you're behind a firewall, or it could be because the extension you want to install is not available as a PECL compatible package, such - as unreleased extensions from CVS. If you need to build such an + as unreleased extensions from SVN. If you need to build such an extension, you can use the lower-level build tools to perform the build manually. @@ -1647,7 +1645,7 @@ directives are documented in the manual though. For a complete list of directives available in your PHP version, please read your well commented php.ini file. Alternatively, you may find the the latest - php.ini from CVS helpful too. + php.ini from SVN helpful too. Example 5-1. php.ini example ; any text on a line after an unquoted semicolon (;) is ignored -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php