[PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
Can I merge to 5.3?
(without this patch all I get are segfaults..)
-Hannes
On Wed, Jun 10, 2009 at 16:28, Hannes Magnussonbj...@php.net wrote:
bjori Wed Jun 10 14:28:06 2009 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix extension loading order
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.276r2=1.277diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.276
php-src/ext/simplexml/simplexml.c:1.277
--- php-src/ext/simplexml/simplexml.c:1.276 Mon May 25 14:32:14 2009
+++ php-src/ext/simplexml/simplexml.c Wed Jun 10 14:28:06 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.276 2009/05/25 14:32:14 felipe Exp $ */
+/* $Id: simplexml.c,v 1.277 2009/06/10 14:28:06 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2532,6 +2532,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED(libxml)
+ ZEND_MOD_REQUIRED(spl)
{NULL, NULL, NULL}
};
/* }}} */
@@ -2616,7 +2617,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.276 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.277 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DEV] Last steps towards 5.3.0
Hi, it was a long run so far and it's time to really take the last steps to get the beast out. For this Lukas and I decided on the following plan: June 10th (today): We package RC3, until then only critical build fixes and similar which have to go in the RC, after review (highlight me on IRC, mail etc.) June 11th: RC3 will be released June 11th-17th A small window for critical fixes and again please check beforehand as we don't want to introduce any new bugs that late in the game. June 17th In case there were commits after RC3 we will package a RC 4 on Wednesday next week June 18th If needed publish RC4 June 18th - June 24th The plan is to repackage RC4 as 5.3.0 final in the beginning of the week of the 21st without any further changes so we can test the packages. In case something critical, unexpected, pops up please notify us asap. June 25th 2009 Release PHP 5.3.0 final. We hope this works out as planned and are excited to finally being close to the release. Lukas and Johannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DEV] PHP 5.3.0
Thanks to all for their hard work on this release. Will the cycle-breaking garbage collector be turned on as the compiled-in default and the recommended php.ini default? Please, please say yes. (: -- Tom Boutell P'unk Avenue 215 755 1330 punkave.com window.punkave.com -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
Just 2 questions 1- Will it include new autoloader definition that standards group was talking about? 2- I still have a BC break that I cannot isolate (huge codebase). I'm trying to find it and once I isolate it and report, will the fix be included before 5.3.0 final? PS: If someone wants to give a hand to find the regression... I can explain how to reproduce. Regards, 2009/6/10 Johannes Schlüter johan...@php.net: Hi, it was a long run so far and it's time to really take the last steps to get the beast out. For this Lukas and I decided on the following plan: June 10th (today): We package RC3, until then only critical build fixes and similar which have to go in the RC, after review (highlight me on IRC, mail etc.) June 11th: RC3 will be released June 11th-17th A small window for critical fixes and again please check beforehand as we don't want to introduce any new bugs that late in the game. June 17th In case there were commits after RC3 we will package a RC 4 on Wednesday next week June 18th If needed publish RC4 June 18th - June 24th The plan is to repackage RC4 as 5.3.0 final in the beginning of the week of the 21st without any further changes so we can test the packages. In case something critical, unexpected, pops up please notify us asap. June 25th 2009 Release PHP 5.3.0 final. We hope this works out as planned and are excited to finally being close to the release. Lukas and Johannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php -- Guilherme Blanco - Web Developer CBC - Certified Bindows Consultant Cell Phone: +55 (16) 9215-8480 MSN: guilhermebla...@hotmail.com URL: http://blog.bisna.com São Paulo - SP/Brazil -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
Guilherme Blanco wrote: Just 2 questions 1- Will it include new autoloader definition that standards group was talking about? Hi, I am not an official RM representative, the following is my opinion: Not the slightest chance. It hasn't even been suggested to internals yet and additionally qualifies as a new feature, so it was a pipe dream of the group in question that it would get into 5.3. Greg -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DEV] doing phar.phar on windows
Hi, I don't see an obvious way to build the phar.phar on windows. Can someone with knowledge of how configure.js works (i.e. a Pierre) give me a tip on how to tell it to make phar.phar after building Release_TS/php.exe or Debug_TS/php.exe? Otherwise, it would also be easy to provide a simple script that builds the phar.phar, and have the snapshot builder run the script. Which way would be better? Thanks, Greg -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
On 10.06.2009, at 17:33, Greg Beaver wrote: Guilherme Blanco wrote: Just 2 questions 1- Will it include new autoloader definition that standards group was talking about? no .. there was no proposal, therefore no discussion, therefore its not going to be included, since we are long past adding new features. regards, Lukas Kahwe Smith m...@pooteeweet.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
Greg, I joined the standards group last week. It seems they already have a patch but it was not yet officially proposed because none reached a common agreement yet. Group switched with PEAR style of proposal and voting. So anyone can propose new inclusions. The patch is actually just a direct check to folder include path/vendor/PackageName But ok, thanks for the clean answer. =) 2009/6/10 Greg Beaver g...@chiaraquartet.net: Guilherme Blanco wrote: Just 2 questions 1- Will it include new autoloader definition that standards group was talking about? Hi, I am not an official RM representative, the following is my opinion: Not the slightest chance. It hasn't even been suggested to internals yet and additionally qualifies as a new feature, so it was a pipe dream of the group in question that it would get into 5.3. Greg -- Guilherme Blanco - Web Developer CBC - Certified Bindows Consultant Cell Phone: +55 (16) 9215-8480 MSN: guilhermebla...@hotmail.com URL: http://blog.bisna.com São Paulo - SP/Brazil -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
On Wed, Jun 10, 2009 at 5:36 PM, Greg Beaverg...@chiaraquartet.net wrote: Hi, I don't see an obvious way to build the phar.phar on windows. Can someone with knowledge of how configure.js works (i.e. a Pierre) give me a tip on how to tell it to make phar.phar after building Release_TS/php.exe or Debug_TS/php.exe? Otherwise, it would also be easy to provide a simple script that builds the phar.phar, and have the snapshot builder run the script. Which way would be better? Can you create it from PHP/using a php script? If yes, we can add it to mkdist.php easily. Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
Hi, On Wed, 2009-06-10 at 12:14 -0300, Guilherme Blanco wrote: 1- Will it include new autoloader definition that standards group was talking about? No proposal, no code, ... 2- I still have a BC break that I cannot isolate (huge codebase). I'm trying to find it and once I isolate it and report, will the fix be included before 5.3.0 final? Maybe. Everything else depends on the case and can't be said in a generic way. The overall goal is not to have too many BC issues - besides lot's of deprecation warnings the only real problem I ever found in multiple applications was related to call_user_func_array() in combination with bad usage of references, but that one hit a few projects I saw. johannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] PHP 5.3.0
On Wed, 2009-06-10 at 10:59 -0400, Tom Boutell wrote: Thanks to all for their hard work on this release. Will the cycle-breaking garbage collector be turned on as the compiled-in default and the recommended php.ini default? Such a thing won't be changed silently before releasing, so you could try and see ;-) $ php -in | grep zend.enable_gc zend.enable_gc = On = On johannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
On Wed, 2009-06-10 at 10:36 -0500, Greg Beaver wrote: Can someone with knowledge of how configure.js works (i.e. a Pierre) give me a tip on how to tell it to make phar.phar after building Release_TS/php.exe or Debug_TS/php.exe? My guess would be changing the all target in win32/build/Makefile adding a new phar.phar target as dependency. I think this file s copied 1:1 over to he target Makefile ... Not sure that's better than Pierre's answer to this thread :-) johannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
2009/6/10 Johannes Schlüter johan...@php.net: On Wed, 2009-06-10 at 10:36 -0500, Greg Beaver wrote: Can someone with knowledge of how configure.js works (i.e. a Pierre) give me a tip on how to tell it to make phar.phar after building Release_TS/php.exe or Debug_TS/php.exe? My guess would be changing the all target in win32/build/Makefile adding a new phar.phar target as dependency. I think this file s copied 1:1 over to he target Makefile ... Not sure that's better than Pierre's answer to this thread :-) Note: I have no idea what phar.phar is and how it is generated. I only mentioned a possible way to do it :) -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
On Wed, 2009-06-10 at 16:31 +0200, Hannes Magnusson wrote:
Can I merge to 5.3?
(without this patch all I get are segfaults..)
Any idea why this fails? In the configure line you gave on IRC you're
building these statically, so PHP_ADD_EXTENSION_DEP in the config.m4
should create the right order without the need or runtime resolution.
The patch itself is fine, but I'd like to understand what's broken
before hiding a possible problem.
johannes
-Hannes
On Wed, Jun 10, 2009 at 16:28, Hannes Magnussonbj...@php.net wrote:
bjori Wed Jun 10 14:28:06 2009 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix extension loading order
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.276r2=1.277diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.276
php-src/ext/simplexml/simplexml.c:1.277
--- php-src/ext/simplexml/simplexml.c:1.276 Mon May 25 14:32:14 2009
+++ php-src/ext/simplexml/simplexml.c Wed Jun 10 14:28:06 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.276 2009/05/25 14:32:14 felipe Exp $ */
+/* $Id: simplexml.c,v 1.277 2009/06/10 14:28:06 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2532,6 +2532,7 @@
static const zend_module_dep simplexml_deps[] = { /* {{{ */
ZEND_MOD_REQUIRED(libxml)
+ ZEND_MOD_REQUIRED(spl)
{NULL, NULL, NULL}
};
/* }}} */
@@ -2616,7 +2617,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.276 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.277 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
Pierre Joye wrote:
On Wed, Jun 10, 2009 at 5:36 PM, Greg Beaverg...@chiaraquartet.net wrote:
Hi,
I don't see an obvious way to build the phar.phar on windows.
Can someone with knowledge of how configure.js works (i.e. a Pierre)
give me a tip on how to tell it to make phar.phar after building
Release_TS/php.exe or Debug_TS/php.exe?
Otherwise, it would also be easy to provide a simple script that builds
the phar.phar, and have the snapshot builder run the script.
Which way would be better?
Can you create it from PHP/using a php script?
If yes, we can add it to mkdist.php easily.
Fantastic, in that case, all that needs to be added to mkdist.php is this:
echo Generating phar.phar\r\n;
$phar = new Phar($path_to_php . '/phar.phar', 0, 'pharcommand');
foreach (new DirectoryIterator($path_to_phar . '/phar') as $file) {
if ($file-isDir() || $file == 'phar.php') continue;
echo 'adding ', $file, \r\n;
$phar[(string) $file] = file_get_contents($path_to_phar. '/phar/' .
$file);
}
$phar-setSignatureAlgorithm(Phar::SHA1);
$stub = file($path_to_phar . '/phar/phar.php');
unset($stub[0]); // remove hashbang
$phar-setStub(implode('', $stub));
echo Creating phar.phar.bat\r\n;
file_put_contents($path_to_php . '/phar.phar.bat', 'php phar.phar %1 %2
%3 %4 %5 %6 %7 %8 %9\r\n);
That should do it. The only problem is that the user will need to
adjust the path of phar.phar at install-time, but I don't see any
obvious way around this outside of the win32 installer.
Note that $path_to_php should be the equivalent of C:\php5 and
$path_to_phar should be C:\php5\ext\phar
Greg
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
On Wed, Jun 10, 2009 at 6:44 PM, Greg Beaverg...@chiaraquartet.net wrote:
Pierre Joye wrote:
On Wed, Jun 10, 2009 at 5:36 PM, Greg Beaverg...@chiaraquartet.net wrote:
Hi,
I don't see an obvious way to build the phar.phar on windows.
Can someone with knowledge of how configure.js works (i.e. a Pierre)
give me a tip on how to tell it to make phar.phar after building
Release_TS/php.exe or Debug_TS/php.exe?
Otherwise, it would also be easy to provide a simple script that builds
the phar.phar, and have the snapshot builder run the script.
Which way would be better?
Can you create it from PHP/using a php script?
If yes, we can add it to mkdist.php easily.
Fantastic, in that case, all that needs to be added to mkdist.php is this:
echo Generating phar.phar\r\n;
$phar = new Phar($path_to_php . '/phar.phar', 0, 'pharcommand');
foreach (new DirectoryIterator($path_to_phar . '/phar') as $file) {
if ($file-isDir() || $file == 'phar.php') continue;
echo 'adding ', $file, \r\n;
$phar[(string) $file] = file_get_contents($path_to_phar. '/phar/' .
$file);
}
$phar-setSignatureAlgorithm(Phar::SHA1);
$stub = file($path_to_phar . '/phar/phar.php');
unset($stub[0]); // remove hashbang
$phar-setStub(implode('', $stub));
echo Creating phar.phar.bat\r\n;
file_put_contents($path_to_php . '/phar.phar.bat', 'php phar.phar %1 %2
%3 %4 %5 %6 %7 %8 %9\r\n);
That should do it. The only problem is that the user will need to
adjust the path of phar.phar at install-time, but I don't see any
obvious way around this outside of the win32 installer.
Note that $path_to_php should be the equivalent of C:\php5 and
$path_to_phar should be C:\php5\ext\phar
We don't know these paths when on unzip the releases in some random
directories. Maybe that should be something to add in the installer
instead?
But reading this little script, why don't you detect magically where
phar.bat is in phar.bat and then call phar.phar from there? It is
possible to do that in batch files (see
http://cvs.php.net/viewvc.cgi/php-internals-win/script/ there are some
dirty examples there).
Cheers,
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
On 10.06.2009, at 16:43, Johannes Schlüter wrote: Hi, it was a long run so far and it's time to really take the last steps to get the beast out. For this Lukas and I decided on the following plan: June 10th (today): We package RC3, until then only critical build fixes and similar which have to go in the RC, after review (highlight me on IRC, mail etc.) ok this step is completed June 11th: RC3 will be released June 11th-17th A small window for critical fixes and again please check beforehand as we don't want to introduce any new bugs that late in the game. Ok, we are out of commit freeze. @Ilia: go ahead and merge your fix for #48512 @Tony: you can now apply that curl arginfo patch and the fix for the curl crash @Pierre: you can now also apply the patches you were looking to commit @Hannes: I guess we will wait until Johannes has determined if the patch is really necessary @Andrey: I guess you will/have talked to Johannes about your patches regards, Lukas Kahwe Smith m...@pooteeweet.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
PS: If someone wants to give a hand to find the regression... I can explain how to reproduce. The easiest way is to use a tool to help reducing the test case automatically. I don't know about any specific tool for reducing PHP files, but in the past I've used delta (http://delta.tigris.org/), which is a reducer for C/C++ and it works quite well with PHP. You have to do two things in order it to work: disable topformflat (because it doesn't understand PHP), and inline the included files after the first reduction step, and keep inlining the include()'s that survive to a reduce step. Nevertheless, it's a fairly trivial process. Nuno -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
Hi Guilherme, Nuno, On Wed, Jun 10, 2009 at 9:38 PM, Nuno Lopesnlop...@php.net wrote: PS: If someone wants to give a hand to find the regression... I can explain how to reproduce. The easiest way is to use a tool to help reducing the test case automatically. I don't know about any specific tool for reducing PHP files, but in the past I wrote a tool which automatically. It uses the delta debugging algorithm, but is very much faster than delta, since it knows how PHP works. I hope its also easier to use - you basically write a function which takes source code, and returns true if the bug is still present. Its at http://code.google.com/p/phc/source/browse/trunk/test/framework/reduce/Reduce.php. You need to a copy of phc (phpcompiler.org) as well. The usage is explained in the comments. I've used it a lot, but I've only just made it work more generally. Please report any problems to me. Paul -- Paul Biggar paul.big...@gmail.com -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
Hi Greg
2009/6/10 Greg Beaver g...@chiaraquartet.net:
Fantastic, in that case, all that needs to be added to mkdist.php is this:
echo Generating phar.phar\r\n;
$phar = new Phar($path_to_php . '/phar.phar', 0, 'pharcommand');
foreach (new DirectoryIterator($path_to_phar . '/phar') as $file) {
if ($file-isDir() || $file == 'phar.php') continue;
echo 'adding ', $file, \r\n;
$phar[(string) $file] = file_get_contents($path_to_phar. '/phar/' .
$file);
}
$phar-setSignatureAlgorithm(Phar::SHA1);
$stub = file($path_to_phar . '/phar/phar.php');
unset($stub[0]); // remove hashbang
$phar-setStub(implode('', $stub));
echo Creating phar.phar.bat\r\n;
file_put_contents($path_to_php . '/phar.phar.bat', 'php phar.phar %1 %2
%3 %4 %5 %6 %7 %8 %9\r\n);
To use unlimited parameters, then use %* and it will catch all the parameters.
That should do it. The only problem is that the user will need to
adjust the path of phar.phar at install-time, but I don't see any
obvious way around this outside of the win32 installer.
Note that $path_to_php should be the equivalent of C:\php5 and
$path_to_phar should be C:\php5\ext\phar
Greg
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
--
regrads,
Kalle Sommer Nielsen
ka...@php.net
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Last steps towards 5.3.0
On Wed, Jun 10, 2009 at 11:10 PM, Paul Biggarpaul.big...@gmail.com wrote: I wrote a tool which automatically. It uses the delta debugging I sent this prematurely. It should read I wrote a tool which reduces test cases automatically. algorithm, but is very much faster than delta, since it knows how PHP works. I hope its also easier to use - you basically write a function which takes source code, and returns true if the bug is still present. Its at http://code.google.com/p/phc/source/browse/trunk/test/framework/reduce/Reduce.php. You need to a copy of phc (phpcompiler.org) as well. The usage is explained in the comments. I've used it a lot, but I've only just made it work more generally. Please report any problems to me. Paul -- Paul Biggar paul.big...@gmail.com -- Paul Biggar paul.big...@gmail.com -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
2009/6/10 Johannes Schlüter johan...@php.net: On Wed, 2009-06-10 at 16:31 +0200, Hannes Magnusson wrote: Can I merge to 5.3? (without this patch all I get are segfaults..) Any idea why this fails? In the configure line you gave on IRC you're building these statically, so PHP_ADD_EXTENSION_DEP in the config.m4 should create the right order without the need or runtime resolution. The patch itself is fine, but I'd like to understand what's broken before hiding a possible problem. Sorry, I had a plane to catch so I didn't have the time to look into what exactly was the problem, but it looked like a dependency registration problem - simplexml being loaded before spl, so simplexml was trying to implement not-yet-register interface... Effectively, with that configure line every single php call resulted in a segfault - making the RC useless so I'd like to get that patch committed before the release -Hannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-DEV] doing phar.phar on windows
Hi, I have a working patch against mkdist.php, is it all right to commit? Greg -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DEV] [PATCH] Re: [PHP-DEV] doing phar.phar on windows
I suppose it would help to see the patch, no?
Index: win32/build/Makefile
===
RCS file: /repository/php-src/win32/build/Makefile,v
retrieving revision 1.35.2.1.2.6.2.12
diff -u -r1.35.2.1.2.6.2.12 Makefile
--- win32/build/Makefile27 May 2009 01:46:48 -
1.35.2.1.2.6.2.12
+++ win32/build/Makefile11 Jun 2009 04:17:08 -
@@ -128,7 +128,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -d date.timezone=UTC -n win32/build/mkdist.php
$(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS)
$(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)
$(SNAPSHOT_TEMPLATE)
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS)
$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
Index: win32/build/mkdist.php
===
RCS file: /repository/php-src/win32/build/mkdist.php,v
retrieving revision 1.13.4.1.2.11
diff -u -r1.13.4.1.2.11 mkdist.php
--- win32/build/mkdist.php 3 Jun 2009 01:14:58 - 1.13.4.1.2.11
+++ win32/build/mkdist.php 11 Jun 2009 04:31:54 -
@@ -393,6 +393,27 @@
closedir($directory_list);
}
+function make_phar_dot_phar($dist_dir)
+{
+ if (!extension_loaded('phar')) return;
+ $path_to_php = $dist_dir;
+ $path_to_phar = realpath(__DIR__ . '/../../ext/phar');
+ echo Generating pharcommand.phar\n;
+ $phar = new Phar($path_to_php . '/pharcommand.phar', 0, 'pharcommand');
+ foreach (new DirectoryIterator($path_to_phar . '/phar') as $file) {
+if ($file-isDir() || $file == 'phar.php') continue;
+echo 'adding ', $file, \n;
+$phar[(string) $file] = file_get_contents($path_to_phar. '/phar/' .
$file);
+ }
+ $phar-setSignatureAlgorithm(Phar::SHA1);
+ $stub = file($path_to_phar . '/phar/phar.php');
+ unset($stub[0]); // remove hashbang
+ $phar-setStub(implode('', $stub));
+
+ echo Creating phar.phar.bat\n;
+ file_put_contents($path_to_php . '/phar.phar.bat', %~dp0php.exe
%~dp0pharcommand.phar %1 %2 %3 %4 %5 %6 %7 %8 %9\r\n);
+}
+
if (!is_dir($test_dir)) {
mkdir($test_dir);
}
@@ -489,4 +510,5 @@
echo WARNING: you don't have a snapshot template, your dist will not
be complete\n;
}
+make_phar_dot_phar($dist_dir);
?
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
