gwynne          Thu, 16 Jul 2009 04:54:26 +0000

URL: http://svn.php.net/viewvc?view=revision&revision=284174

Changed paths:
        U   php/php-src/branches/PHP_5_2/build/build.mk
        _U  php/php-src/branches/PHP_5_2/buildconf.bat
        D   php/php-src/branches/PHP_5_2/cvsclean.bat
        _U  php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/mksbcc32.bat
        D   php/php-src/branches/PHP_5_2/svnclean
        _U  php/php-src/branches/PHP_5_2/svnclean.bat
        A   php/php-src/branches/PHP_5_2/vcsclean
        _U  php/php-src/branches/PHP_5_2/win32/EngineSelect.bat
        _U  php/php-src/branches/PHP_5_2/win32/build/configure.bat
        _U  php/php-src/branches/PHP_5_2/win32/build/cvsclean.js
        _U  php/php-src/branches/PHP_5_2/win32/builddef.bat

Log:
MFH: dropped some more mime types, svnclean -> clean for multiple VCS

Modified: php/php-src/branches/PHP_5_2/build/build.mk
===================================================================
--- php/php-src/branches/PHP_5_2/build/build.mk 2009-07-16 04:50:06 UTC (rev 
284173)
+++ php/php-src/branches/PHP_5_2/build/build.mk 2009-07-16 04:54:26 UTC (rev 
284174)
@@ -67,12 +67,15 @@

 cvsclean-work:
        @for i in `find . -name .cvsignore`; do \
-               (cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep 
-v config.nice | sed 's/[\r\n]/ /g'` *.o *.a .libs || true); \
+               (cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep 
-v config.nice | sed 's/[[:space:]]/ /g'` *.o *.a .libs || true); \
        done

 svnclean-work:
-       for i in `find . -type d -and -not -path '*/.svn/*'`; do \
-               (cd `dirname $$i` 2>/dev/null && svn propget svn:ignore $i | 
xargs rm -rf && rm -rf *.o *.a .libs || true);     \
+       @for i in `find . -type d -and -not -path '*/.svn/*'`; do \
+               (cd `dirname $$i` 2>/dev/null && svn propget svn:ignore $$i | 
xargs rm -rf && rm -rf *.o *.a .libs || true);    \
        done

+gitclean-work:
+       @echo "We don't know how to clean Git checkouts yet."
+
 .PHONY: $(ALWAYS) snapshot


Property changes on: php/php-src/branches/PHP_5_2/buildconf.bat
___________________________________________________________________
Deleted: svn:mime-type
   - application/x-msdownload

Deleted: php/php-src/branches/PHP_5_2/cvsclean.bat
===================================================================
(Binary files differ)


Property changes on: 
php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/mksbcc32.bat
___________________________________________________________________
Deleted: svn:mime-type
   - application/x-msdownload

Deleted: php/php-src/branches/PHP_5_2/svnclean
===================================================================
--- php/php-src/branches/PHP_5_2/svnclean       2009-07-16 04:50:06 UTC (rev 
284173)
+++ php/php-src/branches/PHP_5_2/svnclean       2009-07-16 04:54:26 UTC (rev 
284174)
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work


Property changes on: php/php-src/branches/PHP_5_2/svnclean.bat
___________________________________________________________________
Deleted: svn:mime-type
   - application/x-msdownload

Copied: php/php-src/branches/PHP_5_2/vcsclean (from rev 283992, 
php/php-src/branches/PHP_5_2/svnclean)
===================================================================
--- php/php-src/branches/PHP_5_2/vcsclean                               (rev 0)
+++ php/php-src/branches/PHP_5_2/vcsclean       2009-07-16 04:54:26 UTC (rev 
284174)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if test -d 'CVS'; then
+    ${MAKE:-make} -f build/build.mk cvsclean-work
+elif test -d '.svn'; then
+    ${MAKE:-make} -f build/build.mk svnclean-work
+elif test -d '.git'; then
+    ${MAKE:-make} -f build/build.mk gitclean-work
+else
+    echo "Can't figure out your VCS, not cleaning."
+fi


Property changes on: php/php-src/branches/PHP_5_2/win32/EngineSelect.bat
___________________________________________________________________
Deleted: svn:mime-type
   - application/x-msdownload


Property changes on: php/php-src/branches/PHP_5_2/win32/build/configure.bat
___________________________________________________________________
Deleted: svn:mime-type
   - application/x-msdownload


Property changes on: php/php-src/branches/PHP_5_2/win32/build/cvsclean.js
___________________________________________________________________
Deleted: svn:mime-type
   - application/javascript


Property changes on: php/php-src/branches/PHP_5_2/win32/builddef.bat
___________________________________________________________________
Deleted: svn:mime-type
   - application/x-msdownload

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

Reply via email to