X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=Makefile;h=6f557bae544f0079e28bfc58ee3dd64fe69d5015;hp=34a9b0f9667762c2659afa0f1683f890b28fbbd4;hb=deee82377a1f72626cede01fdfec5e9d7cc274ce;hpb=fb88f8872d47629d6605e97300c0d4c474a82803 diff --git a/Makefile b/Makefile index 34a9b0f9..6f557bae 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ 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 + ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),"../$(x)") ./templates clean-templates templates-clean: force rm -rf ./templates @@ -96,6 +96,9 @@ redo-templates: clean-templates templates myfiles: force @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 $(MAKE-SILENT) myfiles | xargs etags @@ -110,8 +113,9 @@ ftags: force #################### 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) +SSHUSER ?= root +SSHURL := $(SSHUSER)@$(MYSLICEBOX): +SSHCOMMAND := ssh $(SSHUSER)@$(MYSLICEBOX) ### rsync options # the config file should probably not be overridden ?? @@ -163,3 +167,14 @@ ifeq (,$(MYSLICEBOX)) else +$(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