X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=f2876a1740f680b4cc18d330e4c647d5eb39eb55;hb=a5724e8f5d3a4541adc9a7727e28ac46fbd54fe8;hp=45071d87ba04c3caa28fe5dc1612f02c1d316e9a;hpb=e21c44a50e6f32ddf033641819960b305bd70b32;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 45071d8..f2876a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,92 @@
+#WWW_UPLOAD_URI = neuro.debian.net:/home/www/neuro.debian.net/www
+WWW_UPLOAD_URI = ../www
+WWW_DIR = build/html/
 
-WWW_UPLOAD_URI = elrond:/home/hanke/public_html/archive
-WWW_DIR = build/_build/html
+WWW_UPLOAD_URI_STATIC=$(WWW_UPLOAD_URI)/_static
 
+# Lentghy one due to updatedb
+all: updatedb upload-website mirmon
+# Quick one -- just rebuilds html if new changes and adjusts the status of the mirrors
+refresh: upload-website-stamp mirmon
 
-prep:
-	mkdir -p build/src
-	cp -r sphinx/* build/src
 
+pics:
+	$(MAKE) -C artwork
 
-html: prep update-db
-	cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build
 
+html: pics source
+	rsync -rvlhpt 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
+	cp neurodebian.cfg 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/
+	@echo "I: extracting header/trailer to be reused in non-sphinx pages"
+	sed -ne '1,/<!-- HEADNOTES -->/p' $(WWW_DIR)/index.html >| $(WWW_DIR)/_static/index-header.ihtml
+	sed -ne '/<h2>Comments<\/h2>/,$$p' $(WWW_DIR)/index.html >| $(WWW_DIR)/_static/index-trailer.ihtml
 
 clean:
+	-rm html-stamp source-stamp upload-website-stamp
+	$(MAKE) -C artwork clean
+
+
+distclean: clean
 	-rm -rf build
 
 
-update-db:
-#		-r http://apsy.gse.uni-magdeburg.de/debian/dists/lenny/Release \
-		-r http://apsy.gse.uni-magdeburg.de/debian/dists/squeeze/Release \
-#	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 \
 		--pkgaddenum pkgs \
-		-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/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
+		--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
+
+mirmon:
+	# update and generate mirrors report
+	[ -x /usr/bin/mirmon ] && mirmon -q -get update -c mirmon-neurodebian.conf 2>&1 \
+        | grep -v 'date: invalid date.*DOCTYPE' || :
+	# [ -x $(WWW_UPLOAD_URI_STATIC)/mirrors-check.ihtml ] &&
+	# everything must be in place!
+	cat $(WWW_UPLOAD_URI_STATIC)/{index-header,mirrors-status,index-trailer}.ihtml \
+	 >| $(WWW_UPLOAD_URI)/mirrors-status.html
+
+.PHONY: removedb removecache updatedb upload-website clean distclean pics html mirmon
+