X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=1de20547c8cebc44c6ea24bc5fb0cff123c80dc4;hb=48962274f4516dec87774eee0e51d9fd302d8da5;hp=6c0eccede622b6d508de3e182df300d54b14aa08;hpb=79c6ce801d33a2ab1774b7156b28bd21110fdf18;p=sfa.git

diff --git a/Makefile b/Makefile
index 6c0ecced..1de20547 100644
--- a/Makefile
+++ b/Makefile
@@ -1,121 +1,245 @@
 #
-## (Re)builds Python metafile (__init__.py) and documentation
-# 
+## (Re)builds Python metafile (__init__.py)
+#
 # overwritten by the specfile
 DESTDIR="/"
-
+PREFIX=/usr
 ##########
-all: keyconvert python
+all: python wsdl
 
-install: keyconvert-install python-install
+install: python-install wsdl-install tests-install
 
-clean: keyconvert-clean python-clean
+clean: python-clean wsdl-clean
 
-.PHONY: all install clean 
-
-##########
-keyconvert:
-	$(MAKE) -C keyconvert
+uninstall: python-uninstall tests-uninstall
 
-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)
+# this used to be 'should-be-redefined-by-specfile' and it indeed should be
+SCMURL=git://git.onelab.eu/sfa.git
 
-.PHONY: keyconvert keyconvert-install keyconvert-clean 
+python: version
 
-##########
-python: $(init)
+version: sfa/util/version.py
+sfa/util/version.py: sfa/util/version.py.in force
+	sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@
 
+# postinstall steps - various cleanups and tweaks for a nicer rpm
 python-install:
-	python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
+	python setup.py install --prefix=$(PREFIX) --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; ln -s sfaadmin.py sfaadmin)
 
-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
 ##########
+wsdl:
+	$(MAKE) -C wsdl
 
-# are the .java files used ?
-tags:	
-	find . -name '*.py' -o -name '*.sh' -o -name '*.ecore'  | grep -v '/\.svn/' | 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/
 
-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()') > $@
+tests-uninstall:
+	rm -rf $(DESTDIR)/usr/share/sfa/tests
 
-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()') > $@
+.PHONY: tests-install tests-uninstall
 
-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()') > $@
+########## refreshing methods package metafile
+# Metafiles - manage Legacy/ and Accessors by hand
+init := sfa/methods/__init__.py
 
-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: $(init)
 
-methods_now := $(sort $(shell fgrep -v '"' geni/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
+index-clean:
+	rm $(init)
 
-util_now := $(sort $(shell fgrep -v '"' geni/util/__init__.py 2>/dev/null))
+methods_now := $(sort $(shell fgrep -v '"' sfa/methods/__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
+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:
+
+##########
+# a lot of stuff in the working dir is just noise
+files:
+	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$'
+
+git-files:
+	@git ls-files | egrep -v '\.(doc|html|pdf)$$'
+
+tags:
+	$(MAKE) git-files | xargs etags
+
+.PHONY: files tags
+
+signatures:
+	(cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
+.PHONY: signatures
+
+########## for uploading onto pypi
+# use pypitest instead for tests (both entries need to be defined in your .pypirc)
+PYPI_TARGET=pypi
+PYPI_TARBALL_HOST=root@build.onelab.eu
+PYPI_TARBALL_TOPDIR=/build/sfa
+
+# a quick attempt on pypitest did not quite work as expected
+# I was hoping to register the project using "setup.py register"
+# but somehow most of my meta data did not make it up there
+# and I could not find out why
+# so I went for the manual method instead
+# there also was a web dialog prompting for a zip file that would
+# be used to initialize the project's home dir but this too
+# did not seem to work the way I was trying to use it, so ...
+
+# this target is still helpful to produce the readme in html from README.md
+index.zip index.html: README.md
+	python readme.py
+
+# I need to run this on my mac as my pypi
+# run git pull first as this often comes afet a module-tag
+# we need to re-run make so the version is right
+git_pypi: git pypi
+
+git:
+	git pull
+	$(MAKE) version
+
+# run this only once the sources are in on the right tag
+pypi: index.html
+	setup.py sdist upload -r $(PYPI_TARGET)
+	ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
+	rsync -ai dist/sfa-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
+
+# cleanup
+clean: readme-clean
+
+readme-clean:
+	rm -f index.html index.zip
 
 ########## sync
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
 # make sync PLC=private.one-lab.org
-# (*) otherwise, entering through the root context
-# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-ifdef GUEST
-ifdef PLCHOST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no $(GUESTHOSTNAME)
+else
+ifdef PLCHOSTVS
+SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
+endif
+endif
 endif
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --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)
-
-sync:
+synccheck:
 ifeq (,$(SSHURL))
-	@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"
+	@echo "sync: I need more info from the command line, e.g."
+	@echo "  make sync PLC=boot.planetlab.eu"
+	@echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
 	@exit 1
-else
-	+$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/
-	+$(RSYNC) geni-config-tty $(SSHURL)/usr/bin
 endif
 
-.PHONY: sync
+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 -ai $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
+
+CLIENTS = $(shell ls clientbin/*.py)
+
+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\*/python3.\*/site-packages/
+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)/lib/systemd/system
+	+$(RSYNC) ./systemd/sfa-setup.sh  $(SSHURL)/usr/bin
+syncconfig:
+	+$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
+synctest: synccheck
+	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
+syncrestart: synccheck
+	-$(SSHCOMMAND) systemctl --system daemon-reload
+	$(SSHCOMMAND) systemctl restart sfa-db
+	$(SSHCOMMAND) systemctl restart sfa-aggregate
+
+syncmig:
+	+$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/
+
+
+# full-fledged
+sync: synclib syncbin syncservices syncconfig syncrestart
+syncdeb: synclibdeb syncbin syncservices syncconfig syncrestart
+# 99% of the time this is enough
+syncfast: synclib syncrestart
+
+.PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast
+
 ##########
+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 -ai --relative $(CLIENTLIBFILES) $(CLIENTLIBTARGET)
+
+#################### convenience, for debugging only
+# make +foo : prints the value of $(foo)
+# make ++foo : idem but verbose, i.e. foo=$(foo)
+++%: varname=$(subst +,,$@)
+++%:
+	@echo "$(varname)=$($(varname))"
++%: varname=$(subst +,,$@)
++%:
+	@echo "$($(varname))"