X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=114fe870ad4c09d200b2aa0703d62a0d478a57a0;hb=a709cf0a97580ed85b5a22481163b14d93486a2b;hp=47dbacc9ca8e0e86ea57757fe39221dbc7563212;hpb=b68af79064f6d34bbaf21e18dc12eeac293f82f9;p=sfa.git

diff --git a/Makefile b/Makefile
index 47dbacc9..114fe870 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,6 @@ python-install:
 	python setup.py install --root=$(DESTDIR)	
 	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
-	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/sfa.sql
 	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan)
 
 python-clean: version-clean
@@ -96,7 +95,7 @@ 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)$$' 
+	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg)$$' 
 tags:	
 	$(MAKE) scan | xargs etags
 
@@ -138,31 +137,38 @@ BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
 	./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
 	$(CLIENTS)
 
-sync:
+synccheck: 
 ifeq (,$(SSHURL))
-	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
+	@echo "*sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
 	@echo "  e.g. make sync PLC=private.one-lab.org"
 	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
 	@exit 1
-else
-	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+endif
+
+
+synclib: synccheck
+	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+synctest: synccheck
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
+syncbin: synccheck
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
+syncinit: synccheck
 	+$(RSYNC) ./init.d/sfa  $(SSHURL)/etc/init.d/
+syncconfig:
 	+$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
-	+$(RSYNC) ./sfa/storage/sfa.sql $(SSHURL)/usr/share/sfa/
+syncrestart: synccheck
 	$(SSHCOMMAND) exec service sfa restart
-endif
 
+# full-fledged
+sync: synclib synctest syncbin syncinit syncconfig syncrestart
 # 99% of the time this is enough
-fastsync:
-	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
-	$(SSHCOMMAND) exec service sfa restart
+fastsync: synclib syncrestart
 
-clientsync:
-	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
+syncrica: synccheck
+	+$(RSYNC) --relative ./sfa/fd ./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+	$(SSHCOMMAND) exec service sfa restart
 
-.PHONY: sync fastsync clientsync
+.PHONY: synccheck sync fastsync clientsync ricasync
 
 ##########
 CLIENTLIBFILES= \