X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=Makefile;h=ad27d39514fd754ea4b4ed4dd43172ac2ea1ef5d;hp=69c1336995046903658a96b842ad4074a65e89c8;hb=f0f76a08ca9dc5d208e1521a73ba1ba60a3c0065;hpb=d463ba934f955dd58900adc3c4d52cf979b66b2c

diff --git a/Makefile b/Makefile
index 69c13369..ad27d395 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,13 @@ SHELL = /bin/bash
 
 MAKE-SILENT = $(MAKE) --no-print-directory
 
-### first purpose, build and install from the specfile
-all: build
+all: static templates
+
+# clean up and recompute
+redo: clean-oldies redo-static redo-templates 
+
+clean-oldies:
+	rm -rf all-static all-templates django-static 
 
 force:
 
@@ -13,104 +18,80 @@ bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-build: static templates
+# 
+build: static templates force
 	python setup.py build
 
 install: 
 	python setup.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/myslice \
-	    --install-scripts=$(DESTDIR)/$(datadir)/myslice \
-	    --install-data=$(DESTDIR)/$(datadir)/myslice
-
-
-#################### third-party layout is kind of special 
-# because we have differents versions, and also we 
-# try to preserve the file structure from upstream
-# so let's handle this manually
-THIRD-PARTY-RESOURCES =
-# ignore variants, use the main symlink	third-party/bootstrap
-THIRD-PARTY-RESOURCES += $(shell ls third-party/bootstrap/*/*)
-# just the single js as identified with a symlink
-THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.bootstrap.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/css/dataTables.bootstrap.css)
-# likewise
-THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.min.js)
-# for storing the visible status of plugins
-THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage.min.js)
-# creating queries uuids on the fly
-THIRD-PARTY-RESOURCES += $(shell ls third-party/uuid/Math.uuid.js)
-# spin comes in plain or min, + the jquery plugin, and our own settings
-THIRD-PARTY-RESOURCES += $(shell ls third-party/spin/*.js)
-# used in QueryCode
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shCore.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shAutoloader.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shBrushPython.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shBrushRuby.js)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shCore.css)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shCoreDefault.css)
-THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shThemeDefault.css)
-
-
-thirdparty-js:
-	@find $(THIRD-PARTY-RESOURCES) -name '*.js'
-thirdparty-css:
-	@find $(THIRD-PARTY-RESOURCES) -name '*.css'
-thirdparty-img:
-	@find $(THIRD-PARTY-RESOURCES) -name '*.png' -o -name '*.ico'
-
-# we might have any of these as templates - e.g. ./unfold/templates/plugin-init.js
-# so if there's a /templates/ in the path ignore the file
-local-js: force
-	@find . -type f -name '*.js' | egrep -v '/all-(static|templates)/|/third-party/|/templates/'
-local-css: force
-	@find . -type f -name '*.css' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
-local-img: force
-	@find . -type f -name '*.png' -o -name '*.ico' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
-
-list-js: thirdparty-js local-js
-list-css: thirdparty-css local-css
-list-img: thirdparty-img local-img
+	    --install-purelib=$(DESTDIR)/$(datadir)/unfold \
+	    --install-scripts=$(DESTDIR)/$(datadir)/unfold \
+	    --install-data=$(DESTDIR)/$(datadir)/unfold
+
+#################### third-party layout is managed as part of collectstatic
+static: force
+	./manage.py collectstatic --noinput
+
+clean-static:
+	rm -rf static/
+
+redo-static: clean-static static
+
+####################
+# general stuff
+DATE=$(shell date -u +"%a, %d %b %Y %T")
+
+# This is called from the build with the following variables set 
+# (see build/Makefile and target_debian)
+# (.) RPMTARBALL
+# (.) RPMVERSION
+# (.) RPMRELEASE
+# (.) RPMNAME
+DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
+DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
+
+debian: static templates debian/changelog debian.source debian.package
+
+debian/changelog: debian/changelog.in
+	sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
+
+debian.source: force 
+	rsync -a $(RPMTARBALL) $(DEBTARBALL)
+
+debian.package:
+	debuild --set-envvar PREFIX=/usr -uc -us -b
+
+debian.clean:
+	$(MAKE) -f debian/rules clean
+	rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
+	find . -name '*.pyc' -delete
+
 
 # having templates in a templates/ subdir is fine most of the time except for plugins
 plugins-templates: force
 	@find plugins -type f -name '*.html' 
 local-templates: force
-	@$(foreach tmpl,$(shell find . -name templates),ls -1 $(tmpl)/*;)
+	@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),ls -1 $(tmpl)/*;)
 
 list-templates: plugins-templates local-templates
 
-#################### manage static contents (extract from all the modules into the single all-static location)
-static run-static static-run: force
-	mkdir -p ./all-static/js all-static/css all-static/img
-	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-js),../../$(x)) ./all-static/js
-	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-css),../../$(x)) ./all-static/css
-	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-img),../../$(x)) ./all-static/img
-
-clean-static static-clean: force
-	rm -rf ./all-static
-
-all-static: clean-static run-static
-
 #################### manage templates for the plugin area
-templates run-templates templates-run: force
-	mkdir -p all-templates
-	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./all-templates
+templates: force
+	mkdir -p templates
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./templates
 
 clean-templates templates-clean: force
-	rm -rf ./all-templates
+	rm -rf ./templates
 
-all-templates: clean-templates run-templates
+redo-templates: clean-templates templates
 
 ####################
-list-all list-resources: list-templates list-js list-css list-img
+### list-all list-resources: list-templates list-js list-css list-img
 
 #################### compute emacs tags
 # list files under git but exclude third-party stuff like bootstrap and jquery
 myfiles: force
-	@git ls-files | egrep -v 'insert(_|-)above|third-party/|play/'
+	@git ls-files | egrep -v 'insert(_|-)above|third-party/|to-be-integrated/'
 
 # in general it's right to rely on the contents as reported by git
 tags: force
@@ -120,14 +101,22 @@ tags: force
 ftags: force
 	find . -type f | fgrep -v '/.git/' | xargs etags
 
-#################### sync : push current code on a (devel) box running myslice
+########################################
+### devel-oriented
+########################################
+
+#################### sync : push current code on a box running myslice
+# this for now targets deployments based on the debian packaging
 SSHURL:=root@$(MYSLICEBOX):/
 SSHCOMMAND:=ssh root@$(MYSLICEBOX)
 
 ### rsync options
 # the config file should probably not be overridden ??
 # --exclude settings.py 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude config.py --exclude all-static --exclude all-templates --exclude '*.sqlite3'  --exclude play/ 
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc'
+LOCAL_RSYNC_EXCLUDES	+= --exclude '*.sqlite3' --exclude myslice.ini
+LOCAL_RSYNC_EXCLUDES	+= --exclude static --exclude templates --exclude build
+LOCAL_RSYNC_EXCLUDES	+= --exclude to-be-integrated --exclude third-party 
 # usual excludes
 RSYNC_EXCLUDES		:= --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n 
@@ -135,26 +124,39 @@ RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 # putting it together
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+#################### minimal convenience for pushing work-in-progress in an apache-based depl.
 # xxx until we come up with a packaging this is going to be a wild guess
 # on debian04 I have stuff in /usr/share/myslice and a symlink in /root/myslice
-#INSTALLED=/usr/share/myslice
-INSTALLED=/root/myslice
+INSTALLED_MAIN		=/usr/share/pyshared
+# this is for a debian box
+INSTALLED_APACHE	=/etc/apache2/sites-available/
+
+sync: sync-main sync-apache
+
+sync-main:
+ifeq (,$(MYSLICEBOX))
+	@echo "you need to set MYSLICEBOX, like in e.g."
+	@echo "  $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
+	@exit 1
+else
+	+$(RSYNC) ./ $(SSHURL)/$(INSTALLED_MAIN)/
+endif
 
-sync:
+sync-apache:
 ifeq (,$(MYSLICEBOX))
 	@echo "you need to set MYSLICEBOX, like in e.g."
 	@echo "  $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
 	@exit 1
 else
-	+$(RSYNC) ./ $(SSHURL)/$(INSTALLED)/
+	+$(RSYNC) ./apache/unfold.conf $(SSHURL)/$(INSTALLED_APACHE)/
+	+$(RSYNC) ./apache/unfold-init-ssl.sh $(SSHURL)/$(bindir)/
 endif
 
-# xxx likewise until we run this under apache it's probably hard to restart from here
 restart:
 ifeq (,$(MYSLICEBOX))
 	@echo "you need to set MYSLICEBOX, like in e.g."
 	@echo "  $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@""
 	@exit 1
 else
-	@echo "$@" target not yet implemented - for an apache based depl it would read ...; exit; @$(SSHCOMMAND) /etc/init.d/apache2 restart
+	+$(SSHCOMMAND) apachectl restart
 endif