git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sending emails in actions.py
[unfold.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
f5bfb0c
..
6f557ba
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-71,8
+71,9
@@
debian.clean:
plugins-templates: force
@find plugins -type f -name '*.html'
local-templates: force
plugins-templates: force
@find plugins -type f -name '*.html'
local-templates: force
- #@$(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),ls -1 $(tmpl)/*;)
- $(foreach tmpl,$(shell find . -name templates | grep -v '^\./templates$$'),find $(tmpl) -maxdepth 1 -type f -name *.html;)
+ @$(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
list-templates: plugins-templates local-templates
@@
-80,11
+81,7
@@
list-templates: plugins-templates local-templates
#################### manage templates for the plugin area
templates: force
@mkdir -p templates
#################### manage templates for the plugin area
templates: force
@mkdir -p templates
- @echo "----"
- @echo $(shell $(MAKE-SILENT) list-templates)
- @echo "----"
- @echo $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x))
- #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
clean-templates templates-clean: force
rm -rf ./templates
@@
-99,6
+96,9
@@
redo-templates: clean-templates templates
myfiles: force
@git ls-files | egrep -v 'insert(_|-)above|third-party/|to-be-integrated/'
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
# in general it's right to rely on the contents as reported by git
tags: force
$(MAKE-SILENT) myfiles | xargs etags
@@
-113,8
+113,9
@@
ftags: force
#################### sync : push current code on a box running myslice
# this for now targets deployments based on the debian packaging
#################### 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 ??
### rsync options
# the config file should probably not be overridden ??
@@
-166,3
+167,14
@@
ifeq (,$(MYSLICEBOX))
else
+$(SSHCOMMAND) apachectl restart
endif
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