X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=e3cd9a4cf0858ddee67f82d5d7328a2712924487;hb=1f1feb6d4914fe0745f61b8e0c90127c15d06069;hp=502c415719bd1147083825a7d00b340d5f710a5c;hpb=cfeb502877d73623a039217f77627f3eb91f273c;p=sfa.git diff --git a/Makefile b/Makefile index 502c4157..e3cd9a4c 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: @@ -137,6 +138,7 @@ else +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/ +$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa +$(RSYNC) $(BINS) $(SSHURL)/usr/bin + +$(RSYNC) ./sfa/init.d/sfa $(SSHURL)/etc/init.d $(SSHCOMMAND) exec service sfa restart endif