X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=b138e0539a7a5e8ed711d8ee645167737cf1f0d9;hb=13cdde8c6f6ea0dac1ea30d703d70938ba8dfcb1;hp=fe50b46ece09edebeb9568f21d760f852bd3bec8;hpb=8bcd3b201e76a72b7e01323b66fc33df08ea99c8;p=plcapi.git

diff --git a/Makefile b/Makefile
index fe50b46..b138e05 100644
--- a/Makefile
+++ b/Makefile
@@ -4,88 +4,103 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.9 2006/12/15 16:19:49 mlhuang Exp $
-#
-
-# Metafiles
-init := PLC/__init__.py PLC/Methods/__init__.py
 
-# Python modules
-modules := psycopg2 pycurl
-modules-install := $(foreach module, $(modules), $(module)-install)
-modules-clean := $(foreach module, $(modules), $(module)-clean)
+# 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 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)
-	python setup.py build
-
-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
-	install -D -m 755 php/xmlrpc/xmlrpc.so $(DESTDIR)/$(shell php-config --extension-dir)/xmlrpc.so
-
-$(subdirs): $(init) $(modules)
+all:
+	python3 setup.py build
 
-$(subdirs): %:
-	$(MAKE) -C $@
+install: install-python install-phpxmlrpc
 
-$(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)
+install-python:
+	pip install --target $(DESTDIR)/$(datadir)/plc_api .
+	# it's important that plcsh sits in /usr/share/plc_api
+	# and not under bin/ so that python can find the PLC/ modules
+	mv $(DESTDIR)/$(datadir)/plc_api/bin/plcsh $(DESTDIR)/$(datadir)/plc_api
+	# python3 setup.py install \
+	#     --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
+	#     --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
+	#     --install-data=$(DESTDIR)/$(datadir)/plc_api
 
-$(modules-install): %-install:
-	cd $* && \
-	    python setup.py install_lib --install-dir=$(DESTDIR)/$(datadir)/plc_api
+# 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/
 
-$(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
-	python setup.py clean && rm -rf build
+	python3 setup.py clean && rm -rf build
 
-index: $(init)
+index:
+	echo "This step is obsolete"
 
-tags:
-	find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags
+##########
 
-# All .py files in PLC/
-PLC := $(filter-out %/__init__.py, $(wildcard PLC/*.py))
-PLC_init := all = '$(notdir $(PLC:.py=))'.split()
+force:
 
-PLC/__init__.py:
-	echo "$(PLC_init)" >$@
+.PHONY: all install force clean index tags
 
-ifneq ($(sort $(PLC_init)), $(sort $(shell cat PLC/__init__.py 2>/dev/null)))
-PLC/__init__.py: force
+#################### 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
+
+.PHONY: tags
+
+########## 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
-
-# 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)" >$@
-
-ifneq ($(sort $(Methods_init)), $(sort $(shell cat PLC/Methods/__init__.py 2>/dev/null)))
-PLC/Methods/__init__.py: force
 endif
 
-force:
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude Accessors_site.py
+RSYNC_EXCLUDES		:= --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
+RSYNC			:= rsync -ai $(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 php $(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) systemctl restart plc
+endif
 
-.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))"