git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into sqlalchemy
[sfa.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
79b71c5
..
0bfc75d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-135,7
+135,8
@@
RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
CLIENTS = $(shell ls sfa/clientbin/*.py)
BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
CLIENTS = $(shell ls sfa/clientbin/*.py)
BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
- ./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
+ ./sfa/server/sfa-start.py \
+ ./sfa/importer/sfa-import.py ./sfa/importer/sfa-nuke.py \
$(CLIENTS)
synccheck:
$(CLIENTS)
synccheck:
@@
-148,7
+149,7
@@
endif
synclib: synccheck
synclib: synccheck
- +$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+ +$(RSYNC) --relative ./sfa/
--exclude migrations
$(SSHURL)/usr/lib\*/python2.\*/site-packages/
syncbin: synccheck
+$(RSYNC) $(BINS) $(SSHURL)/usr/bin/
syncinit: synccheck
syncbin: synccheck
+$(RSYNC) $(BINS) $(SSHURL)/usr/bin/
syncinit: synccheck
@@
-172,7
+173,7
@@
syncfast: synclib syncrestart
.PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast
syncrica: synccheck
.PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast
syncrica: synccheck
- +$(RSYNC) --relative ./sfa/f
d
./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+ +$(RSYNC) --relative ./sfa/f
ederica
./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
$(SSHCOMMAND) exec service sfa restart
.PHONY: syncrica
$(SSHCOMMAND) exec service sfa restart
.PHONY: syncrica