git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f60787d
)
change in convenience targets sync-* in Makefile
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Mon, 23 Feb 2015 18:02:46 +0000
(19:02 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Mon, 23 Feb 2015 18:02:46 +0000
(19:02 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
69725db
..
80d49c4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-110,8
+110,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 ??
@@
-163,3
+164,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