X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=8aa19e3d4f1c01885068669e8b754efa488aa93b;hb=62789c76a0d530dc3a41fc87da9758fa179044a7;hp=033b9e38a4d837998a395c4fe19d9f2dd3dc478d;hpb=455b6a8572de34e53accfa517e97d7e0fd619d8a;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 033b9e3..8aa19e3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,12 @@
 WWW_UPLOAD_URI = ../www
 WWW_DIR = build/html/
 
-all: updatedb upload-website
+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
 
 
 pics:
@@ -10,14 +15,20 @@ pics:
 
 
 html: pics source
-	rsync -rvlhp sphinx/ build/src
+	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
+	-rm html-stamp source-stamp upload-website-stamp
 	$(MAKE) -C artwork clean
 
 
@@ -27,11 +38,12 @@ distclean: clean
 
 source: source-stamp
 source-stamp: build/db.db
-	PYTHONPATH=. python neurodebian/dde.py \
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
 		--cfg neurodebian.cfg \
 		--db build/db.db \
 		--outdir build/src \
 		--pkgaddenum pkgs \
+		--extracts /home/www/neuro.debian.net/www/debian/extracts \
 		commandisirrelevant
 	rm -f html-stamp
 	touch $@
@@ -49,7 +61,7 @@ updatedb: removedb removecache build/db.db
 
 build/db.db:
 	mkdir -p build
-	PYTHONPATH=. python neurodebian/dde.py \
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
 		--cfg neurodebian.cfg \
 		--db build/db.db \
 		updatedb
@@ -57,7 +69,24 @@ build/db.db:
 
 
 upload-website: html
-	rsync -rvzlhp --delete --exclude=debian --exclude=debian-local --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
-
-.PHONY: removedb removecache updatedb upload-website clean distclean pics html
+	rsync -rvzlhp --delete \
+        --exclude=debian --exclude=debian-local --exclude=debian-devel --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