X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=4b9e35a7c432e465bdc0be57ec29b89b60395f49;hb=098f8e6b42a310977c858117f9de30317d367b2a;hp=a903a1b1ec9474ea13c5ef47982354c615b3d3ba;hpb=c5935cbcf3d2bf79dd76b1d4f4cfe292cb540008;p=neurodebian.git

diff --git a/Makefile b/Makefile
index a903a1b..4b9e35a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,102 +1,75 @@
-# Makefile for Sphinx documentation
-#
+#WWW_UPLOAD_URI = neuro.debian.net:/home/www/neuro.debian.net/www
+WWW_UPLOAD_URI = ../www
+WWW_DIR = build/html/
 
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
+all: updatedb upload-website
 
-# Internal variables.
-SRCDIR = build/src
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRCDIR)
 
+pics:
+	$(MAKE) -C artwork
 
-WWW_UPLOAD_URI = elrond:/home/hanke/public_html/archive
-WWW_DIR = build/html
 
+html: pics source
+	rsync -rvlhp sphinx/ build/src
+	cd artwork;	cp button_w200.png logo_tuned/fmri_w200.png ../build/src/_static; cd ..
+	cp 3rd/jquery.livetwitter/jquery.livetwitter.min.js build/src/_static
+	cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build 2>&1
+	mv $(WWW_DIR)/_static/robots.txt $(WWW_DIR)/
+	cp -r build/src/lists $(WWW_DIR)/
+	cp -r sphinx/survey/2011/figures/* $(WWW_DIR)/_images/
 
-.PHONY: help clean html web pickle htmlhelp latex changes linkcheck
 
-
-prep:
-	mkdir -p build
-	cp -r source/* build/src
+clean:
+	-rm html-stamp source-stamp upload-website-stamp
+	$(MAKE) -C artwork clean
 
 
-clean:
+distclean: clean
 	-rm -rf build
 
-html: prep
-	mkdir -p build/html build/doctrees
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
-	@echo
-	@echo "Build finished. The HTML pages are in build/html."
-
-pickle: prep
-	mkdir -p build/pickle build/doctrees
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-web: pickle
-
-json: prep
-	mkdir -p build/json build/doctrees
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp: prep
-	mkdir -p build/htmlhelp build/doctrees
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in build/htmlhelp."
-
-latex: prep
-	mkdir -p build/latex build/doctrees
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in build/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
-
-changes: prep
-	mkdir -p build/changes build/doctrees
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
-	@echo
-	@echo "The overview file is in build/changes."
-
-linkcheck: prep
-	mkdir -p build/linkcheck build/doctrees
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	"or in build/linkcheck/output.txt."
-
-
-update-db:
-	rm -f build/db.db
-	./reblender \
+
+source: source-stamp
+source-stamp: build/db.db
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
+		--cfg neurodebian.cfg \
 		--db build/db.db \
 		--outdir build/src \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/dapper/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/gutsy/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/hardy/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/intrepid/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/etch/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/lenny/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/squeeze/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/sid/Release \
-		-t svn://svn.debian.org/blends/projects/med/trunk/debian-med/tasks/imaging \
-		-t svn://svn.debian.org/blends/projects/med/trunk/debian-med/tasks/imaging-dev \
-		-t svn://svn.debian.org/blends/projects/science/trunk/debian-science/tasks/neuroscience-cognitive \
-		-f fsl-doc -f fslview-doc -f fsl-atlases -f fsl-possum-data \
-		-f fsl-first-data -f fsl-feeds \
-		-p svn://svn.debian.org/blends/projects/science/trunk/debian-science/tasks/neuroscience-cognitive
+		--pkgaddenum pkgs \
+		--extracts /home/www/neuro.debian.net/www/debian/extracts \
+		commandisirrelevant
+	rm -f html-stamp
+	touch $@
+
+
+removecache:
+	-rm -rf build/cache
+
+removedb:
+	-rm -f build/db.db
+
+
+updatedb: removedb removecache build/db.db
+
+
+build/db.db:
+	mkdir -p build
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
+		--cfg neurodebian.cfg \
+		--db build/db.db \
+		updatedb
+	-rm -f source-stamp
 
 
 upload-website: html
-	rsync -rvzlhp --delete --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
+	rsync -rvzlhp --delete \
+        --exclude=debian --exclude=debian-local --exclude=_files \
+        --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
+	: # Touch stamp here so we get it updated on every upload
+	touch $@-stamp
+
+# call upload iff .git/index was modified, i.e. new changes got pulled in
+upload-website-stamp: .git/index
+	$(MAKE) upload-website
+
+.PHONY: removedb removecache updatedb upload-website clean distclean pics html
+