X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=cc14e566d530ae3fbde7abdf1a678fdf37a484c0;hb=refs%2Fheads%2F4.3;hp=2fc4409a89ff5818cf3f870fe4dcb71601f59550;hpb=7efac2c8cc221a2ee5145b6806a4f0886418ae4d;p=plcapi.git

diff --git a/Makefile b/Makefile
index 2fc4409..cc14e56 100644
--- a/Makefile
+++ b/Makefile
@@ -5,68 +5,42 @@
 # Copyright (C) 2005 The Trustees of Princeton University
 #
 # $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 PLC/Legacy/__init__.py
 
-# Python modules
-# see PLCAPI.spec for the settings of modules
-# default is : no extra module get built
+# 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
-#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
-
-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
@@ -77,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
@@ -112,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
@@ -125,11 +77,68 @@ 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()') > $@
+
+########## Legacy/
+# the current content of __init__.py
+LEGACY_now := $(sort $(shell fgrep -v '"' PLC/Legacy/__init__.py 2>/dev/null))
+# what should be declared
+LEGACY_paths := $(filter-out %/__init__.py, $(wildcard PLC/Legacy/*.py))
+LEGACY_files := $(sort $(notdir $(LEGACY_paths:.py=)))
+
+ifneq ($(LEGACY_now),$(LEGACY_files))
+PLC/Legacy/__init__.py: force
+endif
+PLC/Legacy/__init__.py: 
+	(echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Legacy; ls -1 *.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=testbox1.inria.fr GUEST=vplc03.inria.fr
+
+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)
+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=private.one-lab.org"
+	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
+	@exit 1
+else
+	+$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
+	$(SSHCOMMAND) exec apachectl graceful
+endif
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)