X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=93c808b9d6f972dce2ee1f7a7d5a8173d90b134d;hb=c03f386095ce337626738f3dbde790a7266f40a0;hp=f162f5f6539af505bce2b10eabf44fac2fa032b8;hpb=5bb8f044e0085d73ec79abb1822421db3fc50101;p=sfa.git

diff --git a/Makefile b/Makefile
index f162f5f6..93c808b9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,13 @@ uninstall: python-uninstall tests-uninstall
 
 .PHONY: all install clean uninstall
 
-VERSIONTAG=0.0-0-should.be-redefined-by-specfile
+##########
+rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
+# 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
 
-##########
 python: version
 
 version: sfa/util/version.py
@@ -86,9 +89,13 @@ sfa/methods/__init__.py:
 force:
 
 ##########
+# a lot of stuff in the working dir is just noise
+scan:
+	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' 
 tags:	
-	find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$|~$$|\.png$$|\.svg$$|\.out$$|\.bak$$|\.xml$$' | xargs etags
-.PHONY: tags
+	$(MAKE) scan | xargs etags
+
+.PHONY: scan tags
 
 signatures:
 	(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
@@ -120,13 +127,11 @@ 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 \
-sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiListNodes.py \
-sfiListSlivers.py sfadump.py
+CLIENTS = $(shell ls sfa/clientbin/*.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 \
-	$(foreach client,$(CLIENTS),./sfa/client/$(client))
+	./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
+	$(CLIENTS)
 
 sync:
 ifeq (,$(SSHURL))
@@ -137,9 +142,21 @@ 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) ./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
+
 ##########