Commit:    017145bc57e604153f2a2400dd6e73a397f52f96
Author:    Christopher Jones <s...@php.net>         Wed, 31 Jul 2013 12:31:50 
-0700
Parents:   4ed18d5955ad7ac0172f6eec87735fefcd113270
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=017145bc57e604153f2a2400dd6e73a397f52f96

Log:
Allow 'make distclean' to clean up the 'generated' phar.inc

Changed paths:
  M  Makefile.global
  M  ext/phar/Makefile.frag
  D  ext/phar/phar/phar.inc
  A  ext/phar/phar/phar.inc.in


Diff:
diff --git a/Makefile.global b/Makefile.global
index 1a1cd18..caaf6d2 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -125,7 +125,7 @@ distclean: clean
        rm -f sapi/apache/libphp5.module sapi/apache_hooks/libphp5.module
        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 ext/phar/phar.phar ext/phar/phar.php ext/phar/phar/phar.inc
        $(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 faa9db0..d95a998 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
+$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc.in
        -@test -d $(builddir)/phar || mkdir $(builddir)/phar
-       -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc 
$(builddir)/phar/phar.inc
+       -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in 
$(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
deleted file mode 100644
index 7e7d618..0000000
--- a/ext/phar/phar/phar.inc
+++ /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
diff --git a/ext/phar/phar/phar.inc.in b/ext/phar/phar/phar.inc.in
new file mode 100644
index 0000000..7e7d618
--- /dev/null
+++ b/ext/phar/phar/phar.inc.in
@@ -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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to