X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=3cc5ce7a28dea4c4de14bde72cbcc80c6a30c9df;hb=fe81b2c91b436b1882f63023413c7f51b29538ed;hp=ee4855a2611638372351ef87a68982fd11d26570;hpb=db15e87507a9dcc02bfa5637f7195c82d12e7e49;p=plcapi.git diff --git a/Makefile b/Makefile index ee4855a..3cc5ce7 100644 --- a/Makefile +++ b/Makefile @@ -4,65 +4,43 @@ # Mark Huang # Copyright (C) 2005 The Trustees of Princeton University # -# $Id: Makefile 793 2007-08-28 15:21:17Z thierry $ +# $Id$ +# $URL$ # -# Metafiles -init := PLC/__init__.py PLC/Methods/__init__.py +# Metafiles - manage Legacy/ and Accessors by hand +init := PLC/__init__.py PLC/Methods/__init__.py -# Python modules -modules := psycopg2 +# python-pycurl and python-psycopg2 avail. from fedora 5 +# we used to ship our own version of psycopg2 and pycurl, for fedora4 +# starting with 5.0, support for these two modules is taken out -# Temporarily until we can kill the Fedora Core 2 build -curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum)) -pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1 -ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1) -modules += pycurl -endif - -modules-install := $(foreach module, $(modules), $(module)-install) -modules-clean := $(foreach module, $(modules), $(module)-clean) - -# Other stuff -subdirs := doc php php/xmlrpc +# Other stuff - doc not implicit, it's redone by myplc-docs +subdirs := php php/xmlrpc # autoconf compatible variables -DESTDIR := /plc/root +DESTDIR := / datadir := /usr/share bindir := /usr/bin PWD := $(shell pwd) -all: $(init) $(subdirs) $(modules) +all: $(init) $(subdirs) python setup.py build -install: $(modules-install) +install: python setup.py install \ --install-purelib=$(DESTDIR)/$(datadir)/plc_api \ --install-scripts=$(DESTDIR)/$(datadir)/plc_api \ --install-data=$(DESTDIR)/$(datadir)/plc_api install -D -m 755 php/xmlrpc/xmlrpc.so $(DESTDIR)/$(shell php-config --extension-dir)/xmlrpc.so - install -D -m 755 refresh-peer.py $(DESTDIR)/$(bindir)/refresh-peer.py -$(subdirs): $(init) $(modules) +$(subdirs): $(init) $(subdirs): %: $(MAKE) -C $@ -$(modules): - # Install in the current directory so that we can import it while developing - cd $@ && \ - python setup.py build && \ - python setup.py install_lib --install-dir=$(PWD) - -$(modules-install): %-install: - cd $* && \ - python setup.py install_lib --install-dir=$(DESTDIR)/$(datadir)/plc_api - -$(modules-clean): %-clean: - cd $* && python setup.py clean && rm -rf build - -clean: $(modules-clean) +clean: find . -name '*.pyc' | xargs rm -f rm -f $(INIT) for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done @@ -73,31 +51,9 @@ index: $(init) index-clean: rm $(init) -tags: - find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags - -########## make sync PLCHOST=hostname -ifdef PLCHOST -PLCSSH:=root@$(PLCHOST) -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: -ifeq (,$(PLCSSH)) - echo "sync: You must define target host as PLCHOST on the command line" - echo " e.g. make sync PLCHOST=private.one-lab.org" ; exit 1 -else - +$(RSYNC) PLC planetlab4.sql migrations $(PLCSSH):/plc/root/usr/share/plc_api/ - ssh $(PLCSSH) chroot /plc/root apachectl graceful -endif - -#################### -# All .py files in PLC/ +#################### regenerate indexes - not used by the build, as both files are svn added - please update as appropriate +########## PLC/ # the current content of __init__.py PLC_now := $(sort $(shell fgrep -v '"' PLC/__init__.py 2>/dev/null)) # what should be declared @@ -108,9 +64,9 @@ ifneq ($(PLC_now),$(PLC_files)) PLC/__init__.py: force endif PLC/__init__.py: - (echo 'all = """' ; cd PLC; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@ - + (echo '## Please use make index to update this file' ; echo 'all = """' ; cd PLC; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@ +########## Methods/ # the current content of __init__.py METHODS_now := $(sort $(shell fgrep -v '"' PLC/Methods/__init__.py 2>/dev/null)) # what should be declared @@ -121,11 +77,55 @@ ifneq ($(METHODS_now),$(METHODS_files)) PLC/Methods/__init__.py: force endif PLC/Methods/__init__.py: - (echo 'methods = """' ; cd PLC/Methods; ls -1 *.py system/*.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@ + (echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Methods; ls -1 *.py system/*.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@ + +########## force: -.PHONY: all install force clean index tags $(subdirs) $(modules) +.PHONY: all install force clean index tags $(subdirs) + +#################### devel tools +tags: + find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags + +.PHONY: tags + +########## 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=testplc.onelab.eu GUEST=vplc03.inria.fr + +PLCHOST ?= testplc.onelab.eu + +ifdef GUEST +SSHURL:=root@$(PLCHOST):/vservers/$(GUEST) +SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST) +endif +ifdef PLC +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) +RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) +RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) + +sync: +ifeq (,$(SSHURL)) + @echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line" + @echo " e.g. make sync PLC=boot.planetlab.eu" + @echo " or make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr" + @exit 1 +else + +$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/ + +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/ + +$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/ + $(SSHCOMMAND) exec apachectl graceful +endif #################### convenience, for debugging only # make +foo : prints the value of $(foo)