X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=8a71a781b3a09ef41dad5ab5a4af731bc02f90b3;hb=98423c5d9f2489f8d82dbe0cdd798ed33ed8f3b5;hp=4d125080170567cf5389da04bedf7879c48ff6e7;hpb=d910a6190fec258ddbf0e26d01539839ac3fdc76;p=plcapi.git diff --git a/Makefile b/Makefile index 4d12508..8a71a78 100644 --- a/Makefile +++ b/Makefile @@ -4,134 +4,93 @@ # Mark Huang # Copyright (C) 2005 The Trustees of Princeton University # -# $Id$ -# - -# Metafiles -init := PLC/__init__.py PLC/Methods/__init__.py - -# Python modules -# see PLCAPI.spec for the settings of modules -# default is : no extra module get built -## 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 -#pycurl_incompatnum := $(shell printf %d 0x071000) # 7.16.0 -#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1) -#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_incompatnum) && echo 0),1) -#modules += pycurl -#endif -#endif +# 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 -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 # autoconf compatible variables -DESTDIR := /plc/root +DESTDIR := / datadir := /usr/share bindir := /usr/bin PWD := $(shell pwd) -all: $(init) $(subdirs) $(modules) +all: python setup.py build -install: $(modules-install) +install: install-python install-phpxmlrpc + +install-python: 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) +# phpxmlrpc is a git subtree; we just ship all its contents +# under /usr/share/plc_api/php/phpxmlrpc +install-phpxmlrpc: + mkdir -p $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/ + rsync --exclude .git -ai php/phpxmlrpc/ $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/ -$(subdirs): %: - $(MAKE) -C $@ +clean: + find . -name '*.pyc' | xargs rm -f + python setup.py clean && rm -rf build -$(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) +index: + echo "This step is obsolete" -$(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 +force: -clean: $(modules-clean) - find . -name '*.pyc' | xargs rm -f - rm -f $(INIT) - for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done - python setup.py clean && rm -rf build +.PHONY: all install force clean index tags -index: $(init) +#################### devel tools +tags: + find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile -o -name '[0-9][0-9][0-9]*' ')' | fgrep -v '.git/' | xargs etags -index-clean: - rm $(init) +.PHONY: tags -tags: - find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags +########## sync +# 2 forms are supported +# (*) if your plc root context has direct ssh access: +# make sync PLC=private.one-lab.org +# (*) otherwise, for test deployments, use on your testmaster +# $ run export +# and cut'n paste the export lines before you run make sync -########## make sync PLCHOST=hostname -ifdef PLCHOST -ifdef VSERVER -PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER) +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 -o LogLevel=quiet $(GUESTHOSTNAME) endif endif -LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' -RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) +LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude Accessors_site.py +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) sync: -ifeq (,$(PLCSSH)) - echo "sync: You must define PLCHOST and VSERVER on the command line" - echo " e.g. make sync PLCHOST=private.one-lab.org VSERVER=myplc01" ; exit 1 +ifeq (,$(SSHURL)) + @echo "sync: I need more info from the command line, e.g." + @echo " make sync PLC=boot.planetlab.eu" + @echo " make sync PLCHOSTLXC=.. GUESTHOSTNAME=.. GUESTNAME=.." + @exit 1 else - +$(RSYNC) PLC planetlab5.sql migrations $(PLCSSH)/usr/share/plc_api/ - ssh root@$(PLCHOST) vserver $(VSERVER) exec apachectl graceful -endif - -#################### -# All .py files in PLC/ - -# the current content of __init__.py -PLC_now := $(sort $(shell fgrep -v '"' PLC/__init__.py 2>/dev/null)) -# what should be declared -PLC_paths := $(filter-out %/__init__.py, $(wildcard PLC/*.py)) -PLC_files := $(sort $(notdir $(PLC_paths:.py=))) - -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()') > $@ - - -# the current content of __init__.py -METHODS_now := $(sort $(shell fgrep -v '"' PLC/Methods/__init__.py 2>/dev/null)) -# what should be declared -METHODS_paths := $(filter-out %/__init__.py, $(wildcard PLC/Methods/*.py PLC/Methods/system/*.py)) -METHODS_files := $(sort $(notdir $(subst system/, system., $(METHODS_paths:.py=)))) - -ifneq ($(METHODS_now),$(METHODS_files)) -PLC/Methods/__init__.py: force + +$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/ + +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/ + +$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/ + +$(RSYNC) apache/plc.wsgi $(SSHURL)/usr/share/plc_api/apache/ + $(SSHCOMMAND) /etc/plc.d/httpd stop + $(SSHCOMMAND) /etc/plc.d/httpd start 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()') > $@ - -force: - -.PHONY: all install force clean index tags $(subdirs) $(modules) #################### convenience, for debugging only # make +foo : prints the value of $(foo)