X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=ebd0eb80753f2d7268523af9326a27704d63b493;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=aacbe3a0ddf4bc27f9ae4f7df800b11852c2acf0;hpb=01e17eeba10b724375e2244949a6833be129052b;p=plcapi.git

diff --git a/Makefile b/Makefile
index aacbe3a..ebd0eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,47 +4,93 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.1 2006/09/06 15:33:59 mlhuang Exp $
-#
 
-# Metafiles
-INIT := PLC/__init__.py PLC/Methods/__init__.py
+# 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
 
-# Other stuff
-SUBDIRS := doc php
+# Other stuff - doc not implicit, it's redone by myplc-docs
 
-all: $(INIT) $(SUBDIRS)
+# autoconf compatible variables
+DESTDIR := /
+datadir := /usr/share
+bindir := /usr/bin
 
-$(SUBDIRS): %:
-	$(MAKE) -C $@
+PWD := $(shell pwd)
 
-clean:
-	find . -name '*.pyc' -execdir rm -f {} +
-	rm -f $(INIT)
-	for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done
+all: 
+	python setup.py build
 
-# All .py files in PLC/
-PLC := $(filter-out %/__init__.py, $(wildcard PLC/*.py))
-PLC_init := all = '$(notdir $(PLC:.py=))'.split()
+install: 
+	python setup.py install \
+	    --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
+	    --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
+	    --install-data=$(DESTDIR)/$(datadir)/plc_api
 
-PLC/__init__.py:
-	echo "$(PLC_init)" >$@
+clean: 
+	find . -name '*.pyc' | xargs rm -f
+	python setup.py clean && rm -rf build
 
-ifneq ($(sort $(PLC_init)), $(sort $(shell cat PLC/__init__.py 2>/dev/null)))
-PLC/__init__.py: force
-endif
+index:
+	echo "This step is obsolete"
+
+##########
+
+force:
+
+.PHONY: all install force clean index tags
 
-# 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()
+#################### 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
 
-PLC/Methods/__init__.py:
-	echo "$(Methods_init)" >$@
+.PHONY: tags
 
-ifneq ($(sort $(Methods_init)), $(sort $(shell cat PLC/Methods/__init__.py 2>/dev/null)))
-PLC/Methods/__init__.py: force
+########## 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
+
+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
 
-force:
+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 (,$(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) 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
+
+#################### 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))"
 
-.PHONY: force clean $(SUBDIRS)