bjori Mon Apr 14 16:56:51 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/pear fetch.php
Modified files:
/php-src/pear Makefile.frag
Log:
Use PHP to fetch the pear phar
http://cvs.php.net/viewvc.cgi/php-src/pear/Makefile.frag?r1=1.35.6.10.2.2&r2=1.35.6.10.2.2.2.1&diff_format=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35.6.10.2.2
php-src/pear/Makefile.frag:1.35.6.10.2.2.2.1
--- php-src/pear/Makefile.frag:1.35.6.10.2.2 Wed Nov 8 19:05:41 2006
+++ php-src/pear/Makefile.frag Mon Apr 14 16:56:50 2008
@@ -4,8 +4,6 @@
# Skip all php.ini files altogether
PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir=
-derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
-WGET = `which wget 2>/dev/null`
-FETCH = `which fetch 2>/dev/null`
install-pear-installer: $(SAPI_CLI_PATH)
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS)
$(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
@@ -16,15 +14,7 @@
if test -f $(srcdir)/install-pear-nozlib.phar; then \
cp $(srcdir)/install-pear-nozlib.phar
$(builddir)/install-pear-nozlib.phar; \
else \
- if test ! -z "$(WGET)" && test -x "$(WGET)"; then \
- "$(WGET)"
http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/; \
- elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
- "$(FETCH)" -o $(builddir)/
http://pear.php.net/install-pear-nozlib.phar; \
- else \
- echo ""; \
- echo "No download utilities found. Don't know
how to download PEAR archive."; \
- echo ""; \
- fi \
+ $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php
http://pear.php.net/install-pear-nozlib.phar
$(builddir)/install-pear-nozlib.phar; \
fi \
fi
@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs)
$(INSTALL_ROOT)$(peardir); then \
http://cvs.php.net/viewvc.cgi/php-src/pear/fetch.php?view=markup&rev=1.1
Index: php-src/pear/fetch.php
+++ php-src/pear/fetch.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
