X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=4b9e35a7c432e465bdc0be57ec29b89b60395f49;hb=10d43caa0cc1acb4cf336e4f82ff2e31c84d2782;hp=73c66be9619d1b54bd5bc1304dcb256f03f4d23a;hpb=719156d3f49899a6be42344902a7e93cae49325d;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 73c66be..4b9e35a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,75 @@
-# old location
-#WWW_UPLOAD_URI = elrond:/home/hanke/public_html/archive
-# brand new fancy one
-WWW_UPLOAD_URI = neuro.debian.net:/home/www/neuro.debian.net/www
-WWW_DIR = build/html
+#WWW_UPLOAD_URI = neuro.debian.net:/home/www/neuro.debian.net/www
+WWW_UPLOAD_URI = ../www
+WWW_DIR = build/html/
 
-all: html
-
-prep:
-	if [ ! -d build ]; then mkdir build; fi
-	rsync -rvlhp sphinx/ build/src
+all: updatedb upload-website
 
 
 pics:
 	$(MAKE) -C artwork
 
 
-html: html-stamp
-html-stamp: pics prep source
-	cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build
-	touch $@
+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/
 
 
 clean:
-	-rm -rf build
+	-rm html-stamp source-stamp upload-website-stamp
 	$(MAKE) -C artwork clean
 
 
-
 distclean: clean
-	-rm -rf cache
+	-rm -rf build
 
 
 source: source-stamp
 source-stamp: build/db.db
-	tools/reblender generate \
-		--cfg debneuro.cfg \
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
+		--cfg neurodebian.cfg \
 		--db build/db.db \
 		--outdir build/src \
-		--pkgaddenum pkgs
+		--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
-	tools/reblender refreshdb \
-		--cfg debneuro.cfg \
-		--db build/db.db
+	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
 
-.PHONY: prep