[Scipy-svn] r6204 - scipy.org/conference

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2010-01-16 04:29:43 -0600 (Sat, 16 Jan 2010)
New Revision: 6204

Modified:
   scipy.org/conference/Makefile
Log:
replace webup with upload


Modified: scipy.org/conference/Makefile
===================================================================
--- scipy.org/conference/Makefile	2010-01-16 10:29:13 UTC (rev 6203)
+++ scipy.org/conference/Makefile	2010-01-16 10:29:43 UTC (rev 6204)
@@ -15,6 +15,7 @@
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  upload USER=...  to upload to conference.scipy.org
 	@echo "  html      to make standalone HTML files"
 	@echo "  dirhtml   to make HTML files named index.html in directories"
 	@echo "  pickle    to make pickle files"
@@ -29,6 +30,12 @@
 clean:
 	-rm -rf _build/*
 
+upload: html
+	chmod ug=rwX,o=rX -R _build/html
+	rsync -r -z -p \
+	    _build/html/ \
+	    $(USER)@new.scipy.org:/srv/www/conference/
+
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
 	@echo
@@ -86,8 +93,3 @@
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in _build/doctest/output.txt."
-
-webup:
-	@echo "Copying html files to conference.scipy.org..."
-	rsync -avH -e ssh _build/html/ jarrod.millman at conference.scipy.org:/srv/www/conference
-