X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=9df5ce9806f2a8aa0bc8cf59e2584d8ef8f64c00;hb=5310688934eb634ac0a6c3c2f5a9e616dcd1899e;hp=45136a574dcb3fb79d7d503cef93e1569a59bb00;hpb=1ba7f6f2887ea828d8aa515f45993429df2b8b7a;p=sfa.git

diff --git a/Makefile b/Makefile
index 45136a57..9df5ce98 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ python-install:
 	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
+	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations
 	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan)
 
 python-clean: version-clean
@@ -138,34 +139,36 @@ 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
+endif
+
+sync: synccheck
 	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 	+$(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/
+	+$(RSYNC) ./sfa/storage/{sfa.sql,migrations} $(SSHURL)/usr/share/sfa/
 	$(SSHCOMMAND) exec service sfa restart
-endif
 
 # 99% of the time this is enough
-fastsync:
+fastsync: synccheck
 	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
 	$(SSHCOMMAND) exec service sfa restart
 
-clientsync:
+clientsync: synccheck
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
 
-ricasync:
+ricasync: 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= \