I reverted this. We usually discuss changes like these before committing.
(on [EMAIL PROTECTED] so people not on IRC will know too)
Some reason why not do this like you did:
1) It doesn't work with windows
2) What if I have local changes and want to run ./cvsclean && ./buildconf ?
Yet another option for buildconf which should be as simple as possible?
3) This can be done better :)
Now, for the better solution for adding PECL extensions into php-src:
a) Add the STABLE PHP4/5 branch(es) into the PECL/foobar extension.
(Current STABLE for PHP 4 is "PHP_4_3")
b) Remove the files from these STABLE branches in which the PECL/foobar
extension is not supposed to be included.
c) Link the PECL/foobar in CVSROOT/modules to php-src/ext
If someone can tell why using the CVSROOT/modules for this is not working
solution, please speak up or be quiet forever.. =)
--Jani
On Mon, 1 Dec 2003, Ilia Alshanetsky wrote:
>iliaa Mon Dec 1 16:37:36 2003 EDT
>
> Modified files:
> /php-src buildconf
> Log:
> The least intrusive way to 'import' PECL extensions into the main tree.
> For the moment this deals with tidy, further extensions can be added at a
> later point.
>
>
>Index: php-src/buildconf
>diff -u php-src/buildconf:1.60 php-src/buildconf:1.61
>--- php-src/buildconf:1.60 Wed Jun 25 08:56:40 2003
>+++ php-src/buildconf Mon Dec 1 16:37:35 2003
>@@ -1,5 +1,5 @@
> #!/bin/sh
>-# $Id: buildconf,v 1.60 2003/06/25 12:56:40 sas Exp $
>+# $Id: buildconf,v 1.61 2003/12/01 21:37:35 iliaa Exp $
>
> eval `grep '^EXTRA_VERSION=' configure.in`
> case "$EXTRA_VERSION" in
>@@ -12,19 +12,32 @@
> esac
>
> devok=0
>+pecl_args=0
>
>-while test $# -gt 0; do
>- if test "$1" = "--copy"; then
>- automake_flags=--copy
>- fi
>-
>- if test "$1" = "--force"; then
>- devok=1
>- echo "Forcing buildconf"
>- fi
>+# Import 'gold' extensions from PECL
>+GOLDEN='tidy'
>
>- shift
>+for i in $*; do
>+ if test "$i" = "--pecl-import"; then
>+ pecl_args=1
>+ elif test "$i" = "--copy"; then
>+ automake_flags=--copy
>+ pecl_args=0
>+ elif test "$i" = "--force"; then
>+ devok=1
>+ echo "Forcing buildconf"
>+ pecl_args=0
>+ elif test $pecl_args -eq 1; then
>+ # Allow the developer to specify some custom PECL extensions to fetch
>+ GOLDEN=$GOLDEN" "$i
>+ fi
>+done;
>+
>+cd ext;
>+for ext in $GOLDEN; do
>+ cvs co -d $ext pecl/$ext;
> done
>+cd ..;
>
> if test "$dev" = "0" -a "$devok" = "0"; then
> echo "You should not run buildconf in a release package."
>
>
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
