X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=04ed4baede5399d4f99d1be44899aa7a2ace4066;hb=431a6bf78c6232a44b178e2092451e733a71bba3;hp=502c415719bd1147083825a7d00b340d5f710a5c;hpb=5525a97f400f995d64eb23841a66e1f9ed2d53a3;p=sfa.git diff --git a/Makefile b/Makefile index 502c4157..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: @@ -114,7 +114,8 @@ SSHURL:=root@$(PLC):/ SSHCOMMAND:=ssh root@$(PLC) endif -LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' +LOCAL_RSYNC_EXCLUDES += --exclude '*.pyc' +LOCAL_RSYNC_EXCLUDES += --exclude '*.png' --exclude '*.svg' --exclude '*.out' RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES) @@ -124,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: @@ -136,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