#
-## (Re)builds Python metafile (__init__.py)
-#
+## (Re)builds Python metafile (__init__.py)
+#
# overwritten by the specfile
DESTDIR="/"
PREFIX=/usr
##########
-all: python wsdl
+all: python wsdl
install: python-install wsdl-install tests-install
-clean: python-clean wsdl-clean
+clean: python-clean wsdl-clean
uninstall: python-uninstall tests-uninstall
VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
# this used to be 'should-be-redefined-by-specfile' and it indeed should be
SCMURL=git://git.onelab.eu/sfa.git
-TARBALL_HOST=root@build.onelab.eu
-TARBALL_TOPDIR=/build/sfa
-# I have an alternate pypitest entry defined in my .pypirc
-PYPI_TARGET=pypi
python: version
-version: sfa/util/version.py
+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 > $@
version-clean:
rm -f sfa/util/version.py
-.PHONY: python version python-install python-clean version-clean
+.PHONY: python version python-install python-clean version-clean
##########
-wsdl:
- $(MAKE) -C wsdl
+wsdl:
+ $(MAKE) -C wsdl
# propagate DESTDIR from the specfile
wsdl-install:
- $(MAKE) -C wsdl install
+ $(MAKE) -C wsdl install
wsdl-clean:
$(MAKE) -C wsdl clean
.PHONY: wsdl wsdl-install wsdl-clean
######################################## debian packaging
-# The 'debian' target is called from the build with the following variables set
+# The 'debian' target is called from the build with the following variables set
# (see build/Makefile and target_debian)
# (.) RPMTARBALL
# (.) RPMVERSION
debian/changelog: debian/changelog.in
sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
-debian.source: force
+debian.source: force
rsync -a $(RPMTARBALL) $(DEBTARBALL)
debian.package:
- debuild -uc -us -b
+ debuild -uc -us -b
debian.clean:
$(MAKE) -f debian/rules clean
########## refreshing methods package metafile
# Metafiles - manage Legacy/ and Accessors by hand
-init := sfa/methods/__init__.py
+init := sfa/methods/__init__.py
index: $(init)
ifneq ($(methods_now),$(methods_files))
sfa/methods/__init__.py: force
endif
-sfa/methods/__init__.py:
+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)$$'
+ @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 | grep -v '\.doc$$'
+ @git ls-files | egrep -v '\.(doc|html|pdf)$$'
-tags:
+tags:
$(MAKE) git-files | xargs etags
.PHONY: files tags
.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
+# 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: 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 pypi
+
+git:
git pull
- $(MAKE) pypi
+ $(MAKE) version
# run this only once the sources are in on the right tag
-pypi:
+pypi: index.html
setup.py sdist upload -r $(PYPI_TARGET)
- ssh $(TARBALL_HOST) mkdir -p $(TARBALL_TOPDIR)/$(VERSIONTAG)
- rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(TARBALL_HOST):$(TARBALL_TOPDIR)/$(VERSIONTAG)
+ ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
+ rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
# cleanup
clean: readme-clean
else
ifdef PLCHOSTLXC
SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no $(GUESTHOSTNAME)
else
ifdef PLCHOSTVS
SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
endif
endif
-synccheck:
+synccheck:
ifeq (,$(SSHURL))
@echo "sync: I need more info from the command line, e.g."
@echo " make sync PLC=boot.planetlab.eu"
@exit 1
endif
-LOCAL_RSYNC_EXCLUDES += --exclude '*.pyc'
+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,)
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/
syncinit: synccheck
sfa/__init__.py \
sfa/client/{sfaserverproxy,sfaclientlib,__init__}.py \
sfa/trust/{certificate,__init__}.py \
-sfa/util/{sfalogging,faults,genicode,enumeration,__init__}.py
+sfa/util/{sfalogging,faults,genicode,enumeration,__init__}.py
-clientlibsync:
+clientlibsync:
@[ -d "$(CLIENTLIBTARGET)" ] || { echo "You need to set the make variable CLIENTLIBTARGET"; exit 1; }
rsync -av --relative $(CLIENTLIBFILES) $(CLIENTLIBTARGET)
git://git.onelab.eu / sfa.git / blobdiff