X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=Makefile;h=f1b1ce689f504f5506c8b96ed278b0740d39d330;hp=a6965bbef4df310f2bdc2a2b0a5e0b21412cc226;hb=5b8f48a96358adf30514133504eff9f214cefc12;hpb=c0194c9b47e2d3696a335384b7df9979ab7a9aed

diff --git a/Makefile b/Makefile
index a6965bbe..f1b1ce68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,52 @@
 #
-## (Re)builds Python metafile (__init__.py) and documentation
+## (Re)builds Python metafile (__init__.py) 
 # 
 # overwritten by the specfile
 DESTDIR="/"
 
 ##########
-all: keyconvert python wsdl
+all: python wsdl 
 
-install: keyconvert-install python-install wsdl-install
+install: python-install wsdl-install xmlbuilder-install tests-install
 
-clean: keyconvert-clean python-clean wsdl-clean
+clean: python-clean wsdl-clean 
 
-.PHONY: all install clean 
+uninstall: python-uninstall tests-uninstall
 
-##########
-keyconvert:
-	$(MAKE) -C keyconvert
+.PHONY: all install clean uninstall
 
-keyconvert-install:
-	$(MAKE) -C keyconvert install
+##########
+rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
+# somehow %{taglevel} is empty, turns out %{release} has what we want
+rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
+VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
+SCMURL=should-be-redefined-by-specfile
 
-keyconvert-clean:
-	$(MAKE) -C keyconvert clean
+python: version
 
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
+version: sfa/util/version.py
+sfa/util/version.py: sfa/util/version.py.in
+	sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@
 
-##########
-python: 
+xmlbuilder-install:
+	cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
 
+# postinstall steps - various cleanups and tweaks for a nicer rpm
 python-install:
-	python setup.py install --root=$(DESTDIR)
+	python setup.py install --root=$(DESTDIR)	
+	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
+	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
+	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan)
 
-python-clean:
+python-clean: version-clean
 	python setup.py clean
-	rm $(init)
+#	rm $(init)
 
-.PHONY: python python-install python-clean
+version-clean:
+	rm -f sfa/util/version.py
+
+.PHONY: python version python-install python-clean version-clean xmlbuilder-install 
 ##########
 wsdl: 
 	$(MAKE) -C wsdl 
@@ -48,13 +59,51 @@ wsdl-clean:
 	$(MAKE) -C wsdl clean
 
 .PHONY: wsdl wsdl-install wsdl-clean
+
 ##########
+tests-install:
+	mkdir -p $(DESTDIR)/usr/share/sfa/tests
+	install -m 755 tests/*.py $(DESTDIR)/usr/share/sfa/tests/
+
+tests-uninstall:
+	rm -rf $(DESTDIR)/usr/share/sfa/tests
+
+.PHONY: tests-install tests-uninstall
+
+########## refreshing methods package metafile
+# Metafiles - manage Legacy/ and Accessors by hand
+init := sfa/methods/__init__.py 
+
+index: $(init)
+
+index-clean:
+	rm $(init)
+
+methods_now := $(sort $(shell fgrep -v '"' sfa/methods/__init__.py 2>/dev/null))
+# what should be declared
+methods_paths := $(filter-out %/__init__.py, $(wildcard sfa/methods/*.py))
+methods_files := $(sort $(notdir $(methods_paths:.py=)))
+
+ifneq ($(methods_now),$(methods_files))
+sfa/methods/__init__.py: force
+endif
+sfa/methods/__init__.py: 
+	(echo '## Please use make index to update this file' ; echo 'all = """' ; cd sfa/methods; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
 
-# are the .java files used ?
+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|dg)$$' 
 tags:	
-	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
-.PHONY: tags
+	$(MAKE) scan | xargs etags
 
+.PHONY: scan tags
+
+signatures:
+	(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
+.PHONY: signatures
 
 ########## sync
 # 2 forms are supported
@@ -63,6 +112,8 @@ tags:
 # (*) otherwise, entering through the root context
 # make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
 
+PLCHOST ?= testplc.onelab.eu
+
 ifdef GUEST
 ifdef PLCHOST
 SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
@@ -74,27 +125,56 @@ SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 endif
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+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) $(RSYNC_EXCLUDES)
+RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-BINS =	./config/sfa-config-tty ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py \
-	./sfa/server/sfa-server.py \
-	./sfa/client/sfi.py ./sfa/client/getNodes.py ./sfa/client/getRecord.py \
-	./sfa/client/setRecord.py ./sfa/client/genidump.py
+CLIENTS = $(shell ls sfa/clientbin/*.py)
 
-sync:
+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)
+
+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.5/site-packages/sfa/
-	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin
-	$(SSHCOMMAND) exec service sfa restart
 endif
 
-.PHONY: sync
+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/
+	$(SSHCOMMAND) exec service sfa restart
+
+# 99% of the time this is enough
+fastsync: synccheck
+	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+	$(SSHCOMMAND) exec service sfa restart
+
+clientsync: synccheck
+	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
+
+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: synccheck sync fastsync clientsync ricasync
+
 ##########
+CLIENTLIBFILES= \
+sfa/examples/miniclient.py \
+sfa/__init__.py \
+sfa/client/{sfaserverproxy,sfaclientlib,__init__}.py \
+sfa/trust/{certificate,__init__}.py \
+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)