X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=fcc8c829c6b3a89b3e3f048dca5897765d64184a;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=b019480cbf03ea91c6ed3629e337eb2ef899fe33;hpb=69315814e7db26dffacea0d905b868fd51f44bcf;p=plcapi.git

diff --git a/Makefile b/Makefile
index b019480..fcc8c82 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,27 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.7 2006/11/08 23:27:52 mlhuang Exp $
+# $Id: Makefile,v 1.15 2007/10/01 20:51:46 tmack Exp $
 #
 
 # Metafiles
-INIT := PLC/__init__.py PLC/Methods/__init__.py
+init := PLC/__init__.py PLC/Methods/__init__.py
+
+# Python modules
+modules := psycopg2
+
+# 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
+subdirs := doc php php/xmlrpc
 
 # autoconf compatible variables
 DESTDIR := /plc/root
@@ -20,60 +33,107 @@ bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-all: $(INIT) $(SUBDIRS)
+all: $(init) $(subdirs) $(modules)
 	python setup.py build
-        # Install in the current directory so that we can import it
-	cd psycopg2 && \
-	python setup.py build && \
-	python setup.py install --install-lib=$(PWD)
 
-install:
+install: $(modules-install)
 	python setup.py install \
 	    --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
 	    --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
 	    --install-data=$(DESTDIR)/$(datadir)/plc_api
-	(cd psycopg2 && \
-	 python setup.py install --install-lib=$(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): %:
+$(subdirs): $(init) $(modules)
+
+$(subdirs): %:
 	$(MAKE) -C $@
 
-clean:
+$(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)
 	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
-	cd psycopg2 && python setup.py clean && rm -rf build
 
-index: $(INIT)
+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/
-PLC := $(filter-out %/__init__.py, $(wildcard PLC/*.py))
-PLC_init := all = '$(notdir $(PLC:.py=))'.split()
 
-PLC/__init__.py:
-	echo "$(PLC_init)" >$@
+# 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 ($(sort $(PLC_init)), $(sort $(shell cat PLC/__init__.py 2>/dev/null)))
+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()') > $@
 
-# All .py files in PLC/Methods/ and PLC/Methods/system/
-METHODS := $(filter-out %/__init__.py, $(wildcard PLC/Methods/*.py PLC/Methods/system/*.py))
-Methods_init := methods = '$(notdir $(subst system/, system., $(METHODS:.py=)))'.split()
 
-PLC/Methods/__init__.py:
-	echo "$(Methods_init)" >$@
+# 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 ($(sort $(Methods_init)), $(sort $(shell cat PLC/Methods/__init__.py 2>/dev/null)))
+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()') > $@
 
 force:
 
-.PHONY: all install force clean index tags $(SUBDIRS)
+.PHONY: all install force clean index tags $(subdirs) $(modules)
+
+#################### 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))"
+