summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwynne Raskind <gwynne@php.net>2009-07-16 04:43:18 +0000
committerGwynne Raskind <gwynne@php.net>2009-07-16 04:43:18 +0000
commit0a0a8e7866d8b058415734893c3202c599c247ee (patch)
treef3e40f74b7ea039692eaeaebe8b4c0bf47c5b708
parentf5980b7a4ceeeb976054bcd27ee7366738906b23 (diff)
downloadphp-git-0a0a8e7866d8b058415734893c3202c599c247ee.tar.gz
dropped some more mime types, svnclean -> clean for multiple VCS
-rw-r--r--build/build.mk9
-rwxr-xr-xcvsclean.bat2
-rwxr-xr-xsvnclean3
-rwxr-xr-xvcsclean11
4 files changed, 17 insertions, 8 deletions
diff --git a/build/build.mk b/build/build.mk
index 0e4f53eed5..38915accbe 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -45,7 +45,7 @@ $(STAMP): build/buildcheck.sh
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 @@ cvsclean-work:
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
diff --git a/cvsclean.bat b/cvsclean.bat
deleted file mode 100755
index 4c0118d671..0000000000
--- a/cvsclean.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-cscript /nologo win32\build\cvsclean.js
diff --git a/svnclean b/svnclean
deleted file mode 100755
index 0beda87ba4..0000000000
--- a/svnclean
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work
diff --git a/vcsclean b/vcsclean
new file mode 100755
index 0000000000..e1004e4349
--- /dev/null
+++ b/vcsclean
@@ -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