X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=3a7384bc99ac64d7e2cf22671b09ce3a581ed552;hb=d919e8df04d1da8626e1e7a1e41865792cb91fa2;hp=bcf1edca12c7af94ecaa9b7ec253c2aa2c3e8bb7;hpb=7ebd40bbcacbb55e3e56d868b4f31b73c119a1a2;p=sfa.git

diff --git a/Makefile b/Makefile
index bcf1edca..3a7384bc 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@
 DESTDIR="/"
 PREFIX=/usr
 ##########
-all: python wsdl
+all: python
 
-install: python-install wsdl-install tests-install
+install: python-install tests-install
 
-clean: python-clean wsdl-clean
+clean: python-clean
 
 uninstall: python-uninstall tests-uninstall
 
@@ -45,18 +45,6 @@ version-clean:
 	rm -f sfa/util/version.py
 
 .PHONY: python version python-install python-clean version-clean
-##########
-wsdl:
-	$(MAKE) -C wsdl
-
-# propagate DESTDIR from the specfile
-wsdl-install:
-	$(MAKE) -C wsdl install
-
-wsdl-clean:
-	$(MAKE) -C wsdl clean
-
-.PHONY: wsdl wsdl-install wsdl-clean
 
 ##########
 tests-install:
@@ -139,7 +127,7 @@ git:
 pypi: index.html
 	setup.py sdist upload -r $(PYPI_TARGET)
 	ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
-	rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
+	rsync -ai dist/sfa-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
 
 # cleanup
 clean: readme-clean
@@ -183,27 +171,23 @@ LOCAL_RSYNC_EXCLUDES	+= --exclude '*.pyc'
 LOCAL_RSYNC_EXCLUDES	+= --exclude '*.png' --exclude '*.svg' --exclude '*.out'
 RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
+RSYNC			:= rsync -ai $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
 CLIENTS = $(shell ls clientbin/*.py)
 
-BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py ./systemd/sfa-setup.sh \
+BINS =	./config/sfa-config-tty ./systemd/sfa-setup.sh \
 	./sfa/server/sfa-start.py \
 	./clientbin/sfaadmin.py \
 	$(CLIENTS)
 
 synclib: synccheck
-	+$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python2.\*/site-packages/
-synclib3: synccheck
 	+$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python3.\*/site-packages/
-synclibdeb: synccheck
-	+$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/share/pyshared/
 syncmigrations:
 	+$(RSYNC) ./sfa/storage/migrations/versions/*.py $(SSHURL)/usr/share/sfa/migrations/versions/
 syncbin: synccheck
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
 syncservices: synccheck
-	+$(RSYNC) ./systemd/*.service  $(SSHURL)/usr/lib/systemd/system
+	+$(RSYNC) ./systemd/*.service  $(SSHURL)/lib/systemd/system
 	+$(RSYNC) ./systemd/sfa-setup.sh  $(SSHURL)/usr/bin
 syncconfig:
 	+$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
@@ -211,7 +195,8 @@ synctest: synccheck
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 syncrestart: synccheck
 	-$(SSHCOMMAND) systemctl --system daemon-reload
-	$(SSHCOMMAND) service sfa restart
+	$(SSHCOMMAND) systemctl restart sfa-db
+	$(SSHCOMMAND) systemctl restart sfa-aggregate
 
 syncmig:
 	+$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/
@@ -235,7 +220,7 @@ sfa/util/{sfalogging,faults,genicode,enumeration,__init__}.py
 
 clientlibsync:
 	@[ -d "$(CLIENTLIBTARGET)" ] || { echo "You need to set the make variable CLIENTLIBTARGET"; exit 1; }
-	rsync -av --relative $(CLIENTLIBFILES) $(CLIENTLIBTARGET)
+	rsync -ai --relative $(CLIENTLIBFILES) $(CLIENTLIBTARGET)
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)