X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=14be9f080c5e000cdf566a5558df31577a07d457;hb=f6d49a50871d8ecfae168b18f9a2c48b7298b828;hp=0bacbae2352ccae3792acf928c3434c0bd2c218f;hpb=6f0a757c5adf47b4d222cec09514dcd688b93457;p=sfa.git diff --git a/Makefile b/Makefile index 0bacbae2..14be9f08 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +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/migrations (cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan) python-clean: version-clean @@ -134,7 +135,8 @@ 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) synccheck: @@ -147,7 +149,7 @@ endif synclib: synccheck - +$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/ + +$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python2.\*/site-packages/ syncbin: synccheck +$(RSYNC) $(BINS) $(SSHURL)/usr/bin/ syncinit: synccheck @@ -159,6 +161,10 @@ synctest: synccheck syncrestart: synccheck $(SSHCOMMAND) exec service sfa restart +syncmig: + +$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/ + + # full-fledged sync: synclib syncbin syncinit syncconfig syncrestart # 99% of the time this is enough @@ -166,12 +172,6 @@ syncfast: synclib syncrestart .PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast -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: syncrica - ########## CLIENTLIBFILES= \ sfa/examples/miniclient.py \