X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=1ee9e996190892c1e17aa2965496021224b1e5bc;hb=a5d4118a6cb7f2ac2f3d32b8118c2ccf63bcb09e;hp=3706a3bcf88fdecafa4c95fdd0aecdcb623e5bba;hpb=bb6532c1ca28e887152b0640aa448b77d2541287;p=sfa.git

diff --git a/Makefile b/Makefile
index 3706a3bc..1ee9e996 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,8 @@ uninstall: python-uninstall tests-uninstall
 
 ##########
 rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
-# somehow this is empty
-rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{taglevel}\n" 2> /dev/null | head -1)
-rpmtaglevel:=$(if $(rpmtaglevel),$(rpmtaglevel),0)
+# somehow %{taglevel} is empty, turns out %{release} has what we want
+rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
 VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
 SCMURL=should-be-redefined-by-specfile
 
@@ -91,7 +90,7 @@ force:
 
 ##########
 tags:	
-	find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|~$$|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' | xargs etags
+	find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|AA-|~$$|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' | xargs etags
 .PHONY: tags
 
 signatures:
@@ -124,7 +123,7 @@ RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-CLIENTS = sfi.py getNodes.py getRecord.py setRecord.py \
+CLIENTS = sfi.py sfascan.py getNodes.py getRecord.py setRecord.py \
 sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiListNodes.py \
 sfiListSlivers.py sfadump.py
 
@@ -142,10 +141,20 @@ 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/
+	+$(RSYNC) ./init.d/sfa  $(SSHURL)/etc/init.d/
 	+$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
+	+$(RSYNC) ./sfa/storage/sfa.sql $(SSHURL)/usr/share/sfa/
 	$(SSHCOMMAND) exec service sfa restart
 endif
 
-.PHONY: sync
+# 99% of the time this is enough
+fastsync:
+	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+	$(SSHCOMMAND) exec service sfa restart
+
+clientsync:
+	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
+
+.PHONY: sync fastsync clientsync
+
 ##########