X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=04ed4baede5399d4f99d1be44899aa7a2ace4066;hb=70f4308757e799aeb96545f5e0a22c96dc8633c2;hp=9d9c83189edcec47dbefb5d80e2d93e47d1036c0;hpb=80b0c44a89c5114eba0c6cba2fde4fa480530d90;p=sfa.git diff --git a/Makefile b/Makefile index 9d9c8318..04ed4bae 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ uninstall: python-uninstall tests-uninstall .PHONY: all install clean uninstall -VERSIONTAG=should-be-redefined-by-specfile +VERSIONTAG=0.0-0-should.be-redefined-by-specfile SCMURL=should-be-redefined-by-specfile ########## @@ -87,7 +87,7 @@ force: ########## tags: - find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$|~$$|\.png$$|\.svg$$|\.out$$' | xargs etags + find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|~$$|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' | xargs etags .PHONY: tags signatures: @@ -125,7 +125,7 @@ sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiL sfiListSlivers.py sfadump.py BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \ - ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-server.py \ + ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-start.py \ $(foreach client,$(CLIENTS),./sfa/client/$(client)) sync: @@ -137,7 +137,9 @@ ifeq (,$(SSHURL)) else +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/ +$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa - +$(RSYNC) $(BINS) $(SSHURL)/usr/bin + +$(RSYNC) $(BINS) $(SSHURL)/usr/bin/ + +$(RSYNC) ./sfa/init.d/sfa $(SSHURL)/etc/init.d/ + +$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/ $(SSHCOMMAND) exec service sfa restart endif