X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=6f557bae544f0079e28bfc58ee3dd64fe69d5015;hb=5df37d96aa758faa548091932a5d00a76aa16551;hp=2752c9b3e48bf50453f9b14c53598ec174fdb6ea;hpb=868cc75405250d79bdb91d30ee0e1038059180cd;p=myslice.git

diff --git a/Makefile b/Makefile
index 2752c9b3..6f557bae 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ install:
 	    --install-scripts=$(DESTDIR)/$(datadir)/unfold \
 	    --install-data=$(DESTDIR)/$(datadir)/unfold
 
-#################### third-party layout is managed as art of collectstatic
+#################### third-party layout is managed as part of collectstatic
 static: force
 	./manage.py collectstatic --noinput
 
@@ -59,7 +59,7 @@ debian.source: force
 	rsync -a $(RPMTARBALL) $(DEBTARBALL)
 
 debian.package:
-	debuild -uc -us -b 
+	debuild --set-envvar PREFIX=/usr -uc -us -b
 
 debian.clean:
 	$(MAKE) -f debian/rules clean
@@ -71,14 +71,17 @@ debian.clean:
 plugins-templates: force
 	@find plugins -type f -name '*.html' 
 local-templates: force
+	@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),find $(tmpl) -maxdepth 2 -type f -name *.html;)
+local-templates2: force
 	@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),ls -1 $(tmpl)/*;)
 
+
 list-templates: plugins-templates local-templates
 
 #################### manage templates for the plugin area
 templates: force
-	mkdir -p templates
-	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./templates
+	@mkdir -p templates
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),"../$(x)") ./templates
 
 clean-templates templates-clean: force
 	rm -rf ./templates
@@ -91,7 +94,10 @@ redo-templates: clean-templates templates
 #################### 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/'
+
+pyfiles: force
+	@git ls-files | grep '\.py$$'
 
 # in general it's right to rely on the contents as reported by git
 tags: force
@@ -101,14 +107,23 @@ tags: force
 ftags: force
 	find . -type f | fgrep -v '/.git/' | xargs etags
 
-#################### sync : push current code on a (devel) box running myslice
-SSHURL:=root@$(MYSLICEBOX):/
-SSHCOMMAND:=ssh root@$(MYSLICEBOX)
+########################################
+### devel-oriented
+########################################
+
+#################### sync : push current code on a box running myslice
+# this for now targets deployments based on the debian packaging
+SSHUSER    ?= root
+SSHURL     := $(SSHUSER)@$(MYSLICEBOX):
+SSHCOMMAND := ssh $(SSHUSER)@$(MYSLICEBOX)
 
 ### rsync options
 # the config file should probably not be overridden ??
 # --exclude settings.py 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude config.py --exclude static --exclude 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 
@@ -116,27 +131,50 @@ RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 # putting it together
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
-##### convenience for development only, push code on a specific test box
+#################### 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: 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)/
+	+$(RSYNC) ./ $(SSHURL)/$(INSTALLED_MAIN)/
+endif
+
+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) ./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
+
+#SSHUSER=tparment
+#MYSLICEBOX=srv-diana.inria.fr
+sync-devel:
+ifeq (,$(MYSLICEBOX))
+	@echo "you need to set MYSLICEBOX, like in e.g."
+	@echo "  $(MAKE) MYSLICEBOX=srv-diana.inria.fr "$@""
+	@exit 1
+else
+	+$(RSYNC) --relative $$(git ls-files) $(SSHURL)myslice/
 endif