#
-## (Re)builds Python metafile (__init__.py) and documentation
+## (Re)builds Python metafile (__init__.py)
#
# overwritten by the specfile
DESTDIR="/"
##########
-all: keyconvert python
+all: python wsdl
-install: keyconvert-install python-install
+install: python-install wsdl-install xmlbuilder-install tests-install
-clean: keyconvert-clean python-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
+.PHONY: all install clean uninstall
-keyconvert-clean:
- $(MAKE) -C keyconvert clean
+##########
+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
-.PHONY: keyconvert keyconvert-install keyconvert-clean
+python: version
-##########
-python:
- echo 'nothing to do for python - no __init__ generated anymore'
+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:
+ 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)
+
+version-clean:
+ rm -f sfa/util/version.py
-.PHONY: python python-install python-clean
+.PHONY: python version python-install python-clean version-clean xmlbuilder-install
##########
+wsdl:
+ $(MAKE) -C wsdl
-# are the .java files used ?
-tags:
- find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
-.PHONY: tags
+# propagate DESTDIR from the specfile
+wsdl-install:
+ $(MAKE) -C wsdl install
+wsdl-clean:
+ $(MAKE) -C wsdl clean
-########## indexes
-init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py
+.PHONY: wsdl wsdl-install wsdl-clean
-force:
-.PHONY: force
+##########
+tests-install:
+ mkdir -p $(DESTDIR)/usr/share/sfa/tests
+ install -m 755 tests/*.py $(DESTDIR)/usr/share/sfa/tests/
-index: $(init)
-.PHONY: index
+tests-uninstall:
+ rm -rf $(DESTDIR)/usr/share/sfa/tests
-geni/__init__.py:
- (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+.PHONY: tests-install tests-uninstall
-geni/methods/__init__.py:
- (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni/methods; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+########## refreshing methods package metafile
+# Metafiles - manage Legacy/ and Accessors by hand
+init := sfa/methods/__init__.py
-geni/util/__init__.py:
- (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni/util; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+index: $(init)
-geni_now := $(sort $(shell fgrep -v '"' geni/__init__.py 2>/dev/null))
-# what should be declared
-geni_paths := $(filter-out %/__init__.py, $(wildcard geni/*.py))
-geni_files := $(sort $(notdir $(geni_paths:.py=)))
-ifneq ($(geni_now), $(geni_files))
-geni/__init__.py: force
-endif
+index-clean:
+ rm $(init)
-methods_now := $(sort $(shell fgrep -v '"' geni/methods/__init__.py 2>/dev/null))
+methods_now := $(sort $(shell fgrep -v '"' sfa/methods/__init__.py 2>/dev/null))
# what should be declared
-method_paths := $(filter-out %/__init__.py, $(wildcard geni/methods/*.py))
-method_files := $(sort $(notdir $(method_paths:.py=)))
-ifneq ($(methods_now), $(methods_files))
-geni/methods/__init__.py: force
-endif
+methods_paths := $(filter-out %/__init__.py, $(wildcard sfa/methods/*.py))
+methods_files := $(sort $(notdir $(methods_paths:.py=)))
-util_now := $(sort $(shell fgrep -v '"' geni/util/__init__.py 2>/dev/null))
-# what should be declared
-util_paths := $(filter-out %/__init__.py, $(wildcard geni/util/*.py))
-util_files := $(sort $(notdir $(util_paths:.py=)))
-ifneq ($(util_now), $(util_files))
-geni/util/__init__.py: force
+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:
+
+##########
+# 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|xml|dg)$$'
+tags:
+ $(MAKE) scan | xargs etags
+
+.PHONY: scan tags
+
+signatures:
+ (cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
+.PHONY: signatures
########## sync
# 2 forms are supported
# (*) 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)
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)
+
+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 \
+ $(CLIENTS)
sync:
ifeq (,$(SSHURL))
@echo " or make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
@exit 1
else
- +$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/
- +$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
- $(SSHCOMMAND) exec service geni restart
+ +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+ +$(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/
+ +$(RSYNC) ./sfa/storage/sfa.sql $(SSHURL)/usr/share/sfa/
+ $(SSHCOMMAND) exec service sfa restart
endif
-.PHONY: sync
+# 99% of the time this is enough
+fastsync:
+ +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+ $(SSHCOMMAND) exec service sfa restart
+
+clientsync:
+ +$(RSYNC) $(BINS) $(SSHURL)/usr/bin/
+
+.PHONY: sync fastsync clientsync
+
##########
git://git.onelab.eu / sfa.git / blobdiff