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

diff --git a/Makefile b/Makefile
index 4d16d99..b138e05 100644
--- a/Makefile
+++ b/Makefile
@@ -4,19 +4,12 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
-
-# Metafiles - manage Legacy/ and Accessors by hand
-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 - doc not implicit, it's redone by myplc-docs
-subdirs := php php/xmlrpc
 
 # autoconf compatible variables
 DESTDIR := /
@@ -25,69 +18,43 @@ bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-all: $(init) $(subdirs) 
-	python setup.py build
+all:
+	python3 setup.py build
 
-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: install-python install-phpxmlrpc
 
-$(subdirs): $(init)
+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
 
-$(subdirs): %:
-	$(MAKE) -C $@
+# 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/
 
-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
-
-index: $(init)
-
-index-clean:
-	rm $(init)
+	python3 setup.py clean && rm -rf build
 
-#################### 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
-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 '## 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
-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
-endif
-PLC/Methods/__init__.py: 
-	(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()') > $@
+index:
+	echo "This step is obsolete"
 
 ##########
 
 force:
 
-.PHONY: all install force clean index tags $(subdirs)
+.PHONY: all install force clean index tags
 
 #################### devel tools
 tags:
-	find . '(' -name '*.py' -o -name '*.sql' -o -name '*.php' -o -name Makefile ')' | xargs etags
+	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
 
@@ -95,35 +62,37 @@ tags:
 # 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
-
-PLCHOST ?= testplc.onelab.eu
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-ifdef GUEST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
 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 '*~' --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)
+RSYNC			:= rsync -ai $(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=boot.planetlab.eu"
-	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
+	@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 $(SSHURL)/usr/share/plc_api/
+	+$(RSYNC) plcsh PLC planetlab5.sql migrations php $(SSHURL)/usr/share/plc_api/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
-	$(SSHCOMMAND) exec apachectl graceful
+	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+	+$(RSYNC) apache/plc.wsgi $(SSHURL)/usr/share/plc_api/apache/
+	$(SSHCOMMAND) systemctl restart plc
 endif
 
 #################### convenience, for debugging only
@@ -135,4 +104,3 @@ endif
 +%: varname=$(subst +,,$@)
 +%:
 	@echo "$($(varname))"
-