X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=c122cf3dfa2d0129c70f6236d137b42a7956c739;hb=6559e50c0e0a3f278183d8b829b8fc21f0f04c8b;hp=66219b0fdcec3cf1e83ce02ccd0b8f5d2728928f;hpb=baf69ca158a5656a30029e666d79783dcf0f7f88;p=sfa.git

diff --git a/Makefile b/Makefile
index 66219b0f..c122cf3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,45 @@
 #
-## (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 xmlbuilder-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
-
-keyconvert-install:
-	$(MAKE) -C keyconvert install
-
-keyconvert-clean:
-	$(MAKE) -C keyconvert clean
+.PHONY: all install clean uninstall
 
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
+VERSIONTAG=should-be-redefined-by-specfile
+SCMURL=should-be-redefined-by-specfile
 
 ##########
-python: 
+python: version
+
+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 > $@
 
 xmlbuilder-install:
-	python xmlbuilder-0.9/setup.py install 
-	
+	cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+ 
 python-install:
-	python setup.py install --root=$(DESTDIR)
+	python setup.py install --root=$(DESTDIR)	
 	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 
-python-clean:
+python-clean: version-clean
 	python setup.py clean
-	rm $(init)
+#	rm $(init)
 
-.PHONY: python python-install python-clean xmlbuilder-install
+version-clean:
+	rm -f sfa/util/version.py
+
+.PHONY: python version python-install python-clean version-clean xmlbuilder-install 
 ##########
 wsdl: 
 	$(MAKE) -C wsdl 
@@ -52,13 +52,47 @@ 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 
 
-# are the .java files used ?
+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()') > $@
+
+force:
+
+##########
 tags:	
-	find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+	find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$|~$$' | xargs etags
 .PHONY: tags
 
+signatures:
+	(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
+.PHONY: signatures
 
 ########## sync
 # 2 forms are supported
@@ -67,6 +101,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)
@@ -79,9 +115,9 @@ SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+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 ./config/gen-sfa-cm-config.py \
 	./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-server.py \
@@ -95,7 +131,8 @@ ifeq (,$(SSHURL))
 	@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) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin
 	$(SSHCOMMAND) exec service sfa restart
 endif