gwynne Thu, 16 Jul 2009 04:43:18 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284172
Changed paths:
U php/php-src/trunk/build/build.mk
_U php/php-src/trunk/buildconf.bat
D php/php-src/trunk/cvsclean.bat
_U php/php-src/trunk/ext/mbstring/libmbfl/mksbcc32.bat
_U php/php-src/trunk/ext/session/mod_files.bat
_U php/php-src/trunk/ext/standard/tests/file/windows_acls/tiny.bat
D php/php-src/trunk/svnclean
_U php/php-src/trunk/svnclean.bat
A php/php-src/trunk/vcsclean
_U php/php-src/trunk/win32/EngineSelect.bat
_U php/php-src/trunk/win32/build/configure.bat
_U php/php-src/trunk/win32/build/cvsclean.js
_U php/php-src/trunk/win32/builddef.bat
Log:
dropped some more mime types, svnclean -> clean for multiple VCS
Modified: php/php-src/trunk/build/build.mk
===================================================================
--- php/php-src/trunk/build/build.mk 2009-07-16 03:20:18 UTC (rev 284171)
+++ php/php-src/trunk/build/build.mk 2009-07-16 04:43:18 UTC (rev 284172)
@@ -45,7 +45,7 @@
snapshot:
distname='$(DISTNAME)'; \
if test -z "$$distname"; then \
- distname='php5-snapshot'; \
+ distname='php6-snapshot'; \
fi; \
myname=`basename \`pwd\`` ; \
cd .. && cp -rp $$myname $$distname; \
@@ -71,8 +71,11 @@
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/trunk/buildconf.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/trunk/cvsclean.bat
===================================================================
(Binary files differ)
Property changes on: php/php-src/trunk/ext/mbstring/libmbfl/mksbcc32.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/trunk/ext/session/mod_files.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Property changes on:
php/php-src/trunk/ext/standard/tests/file/windows_acls/tiny.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/trunk/svnclean
===================================================================
--- php/php-src/trunk/svnclean 2009-07-16 03:20:18 UTC (rev 284171)
+++ php/php-src/trunk/svnclean 2009-07-16 04:43:18 UTC (rev 284172)
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work
Property changes on: php/php-src/trunk/svnclean.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Copied: php/php-src/trunk/vcsclean (from rev 284099, php/php-src/trunk/svnclean)
===================================================================
--- php/php-src/trunk/vcsclean (rev 0)
+++ php/php-src/trunk/vcsclean 2009-07-16 04:43:18 UTC (rev 284172)
@@ -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/trunk/win32/EngineSelect.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/trunk/win32/build/configure.bat
___________________________________________________________________
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/trunk/win32/build/cvsclean.js
___________________________________________________________________
Deleted: svn:mime-type
- application/javascript
Property changes on: php/php-src/trunk/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
