Commit: 146b933ab49f8068a5fe983bcb5c821e103e575e Author: Christopher Jones <s...@php.net> Thu, 1 Aug 2013 08:47:13 -0700 Parents: c069b5f571f0d5d28d8f12cbf795155fe4c1c90b Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=146b933ab49f8068a5fe983bcb5c821e103e575e Log: Revert "Allow 'make distclean' to clean up the 'generated' phar.inc" This reverts commit 017145bc57e604153f2a2400dd6e73a397f52f96. Changed paths: M Makefile.global M ext/phar/Makefile.frag A ext/phar/phar/phar.inc D ext/phar/phar/phar.inc.in Diff: diff --git a/Makefile.global b/Makefile.global index 73fcdda..a868ad0 100644 --- a/Makefile.global +++ b/Makefile.global @@ -124,7 +124,7 @@ distclean: clean rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1 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 ext/phar/phar/phar.inc + rm -f ext/phar/phar.phar ext/phar/phar.php $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f .PHONY: all clean install distclean test diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index d95a998..faa9db0 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -20,9 +20,9 @@ PHP_PHARCMD_EXECUTABLE = ` \ fi;` PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` -$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc.in +$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc -@test -d $(builddir)/phar || mkdir $(builddir)/phar - -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in $(builddir)/phar/phar.inc + -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) -@echo "Generating phar.php" diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc new file mode 100644 index 0000000..7e7d618 --- /dev/null +++ b/ext/phar/phar/phar.inc @@ -0,0 +1,80 @@ +<?php + +/** + * @file phar.inc + * @ingroup Phar + * @brief class Phar + * @author Marcus Boerger + * @date 2007 - 2008 + * + * Phar Command + */ +// {{{ class Phar extends PHP_Archive +/** + * Phar class + * + * @ingroup Phar + * @brief Phar implementation + * @author Marcus Boerger + * @version 1.0 + */ +class Phar extends PHP_Archive implements RecursiveIterator +{ + function getSignature() + { + return false; + } + + function getAlias() + { + return false; + } + + function rewind() + { + } + + function valid() + { + return false; + } + + function current() + { + } + + function key() + { + } + + function next() + { + } + + function hasChildren() + { + return false; + } + + function getChildren() + { + } + + function hasMetadata() + { + } + + function getMetadata() + { + } + + function getStub() + { + } + + function setStub() + { + } +} + +?> \ No newline at end of file diff --git a/ext/phar/phar/phar.inc.in b/ext/phar/phar/phar.inc.in deleted file mode 100644 index 7e7d618..0000000 --- a/ext/phar/phar/phar.inc.in +++ /dev/null @@ -1,80 +0,0 @@ -<?php - -/** - * @file phar.inc - * @ingroup Phar - * @brief class Phar - * @author Marcus Boerger - * @date 2007 - 2008 - * - * Phar Command - */ -// {{{ class Phar extends PHP_Archive -/** - * Phar class - * - * @ingroup Phar - * @brief Phar implementation - * @author Marcus Boerger - * @version 1.0 - */ -class Phar extends PHP_Archive implements RecursiveIterator -{ - function getSignature() - { - return false; - } - - function getAlias() - { - return false; - } - - function rewind() - { - } - - function valid() - { - return false; - } - - function current() - { - } - - function key() - { - } - - function next() - { - } - - function hasChildren() - { - return false; - } - - function getChildren() - { - } - - function hasMetadata() - { - } - - function getMetadata() - { - } - - function getStub() - { - } - - function setStub() - { - } -} - -?> \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
