Re: [PHP-CVS] com php-src: Make 'make distclean' remove the downloaded pear PHAR: Makefile.global
On 09/30/2013 05:07 PM, Johannes Schlüter wrote: hi, On Mon, 2013-09-30 at 22:46 +, Christopher Jones wrote: Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce Author:Christopher Jones Mon, 30 Sep 2013 15:46:22 -0700 Parents: d4d6a95105feb3d7a39a5dfea7c4cd3080097295 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d7baf0427fb56cbde55495e5c2071b1cdacb94ce Log: Make 'make distclean' remove the downloaded pear PHAR My understanding of what "distclean" should do is "clean it up to distribution state". Distribution tarballs should have the pear file as bundled by the release script and therefore the pear file should not be removed. I agree that we might need an "obvious" way for git users to update that file from time to time. (I assume that is the intention with this) It was to clean up out-of-tree builds, so that the whole build process is 100% repeatable. Not related to the issue I was looking at, the git-clean target uses -X. Does anyone recall why it doesn't do a full clean? Separately, I notice that the 5.5 snap is including things like an autom4te.cache dir and various *.orig files. This could be improved. Also depending who does release bundling, the bison etc versions used can vary between releases which isn't so good. -- christopher.jo...@oracle.com http://twitter.com/ghrd Free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Make 'make distclean' remove the downloaded pear PHAR: Makefile.global
hi, On Mon, 2013-09-30 at 22:46 +, Christopher Jones wrote: > Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce > Author:Christopher Jones Mon, 30 Sep 2013 15:46:22 > -0700 > Parents: d4d6a95105feb3d7a39a5dfea7c4cd3080097295 > Branches: PHP-5.5 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=d7baf0427fb56cbde55495e5c2071b1cdacb94ce > > Log: > Make 'make distclean' remove the downloaded pear PHAR My understanding of what "distclean" should do is "clean it up to distribution state". Distribution tarballs should have the pear file as bundled by the release script and therefore the pear file should not be removed. I agree that we might need an "obvious" way for git users to update that file from time to time. (I assume that is the intention with this) johannes > Changed paths: > M Makefile.global > > > Diff: > diff --git a/Makefile.global b/Makefile.global > index 05c5d15..c56ef99 100644 > --- a/Makefile.global > +++ b/Makefile.global > @@ -125,6 +125,7 @@ distclean: clean > rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm > sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html > rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h > ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h > ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h > ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h > ext/iconv/php_php_iconv_impl.h > rm -f ext/phar/phar.phar ext/phar/phar.php > + rm -f pear/install-pear-nozlib.phar > if test "$(srcdir)" != "$(builddir)"; then \ > rm -f ext/phar/phar/phar.inc; \ > fi > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Make 'make distclean' remove the downloaded pear PHAR: Makefile.global
Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce Author:Christopher Jones Mon, 30 Sep 2013 15:46:22 -0700 Parents: d4d6a95105feb3d7a39a5dfea7c4cd3080097295 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d7baf0427fb56cbde55495e5c2071b1cdacb94ce Log: Make 'make distclean' remove the downloaded pear PHAR Changed paths: M Makefile.global Diff: diff --git a/Makefile.global b/Makefile.global index 05c5d15..c56ef99 100644 --- a/Makefile.global +++ b/Makefile.global @@ -125,6 +125,7 @@ distclean: clean rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h rm -f ext/phar/phar.phar ext/phar/phar.php + rm -f pear/install-pear-nozlib.phar if test "$(srcdir)" != "$(builddir)"; then \ rm -f ext/phar/phar/phar.inc; \ fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
