X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=14be9f080c5e000cdf566a5558df31577a07d457;hb=f6d49a50871d8ecfae168b18f9a2c48b7298b828;hp=45136a574dcb3fb79d7d503cef93e1569a59bb00;hpb=e67041c37b86490c71d2f0b4d4b9c27b283141de;p=sfa.git

diff --git a/Makefile b/Makefile
index 45136a57..14be9f08 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ 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
+	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
@@ -135,37 +135,42 @@ RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 CLIENTS = $(shell ls sfa/clientbin/*.py)
 
 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 \
+	./sfa/server/sfa-start.py \
+	./sfa/importer/sfaadmin.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) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
-	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
+endif
+
+
+synclib: synccheck
+	+$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+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/
+synctest: synccheck
+	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
+syncrestart: synccheck
 	$(SSHCOMMAND) exec service sfa restart
-endif
 
-# 99% of the time this is enough
-fastsync:
-	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
-	$(SSHCOMMAND) exec service sfa restart
+syncmig:
+	+$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/
 
-clientsync:
-	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
 
-ricasync:
-	+$(RSYNC) --relative ./sfa/fd ./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+# full-fledged
+sync: synclib syncbin syncinit syncconfig syncrestart
+# 99% of the time this is enough
+syncfast: synclib syncrestart
 
-.PHONY: sync fastsync clientsync
+.PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast
 
 ##########
 CLIENTLIBFILES= \