X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=3cc5ce7a28dea4c4de14bde72cbcc80c6a30c9df;hb=fe81b2c91b436b1882f63023413c7f51b29538ed;hp=7c845125b2a1afe0d8f5ac22c88e4e8302cceeb9;hpb=8ad36a5f88bbc31972107fb83483555b948bc361;p=plcapi.git

diff --git a/Makefile b/Makefile
index 7c84512..3cc5ce7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,11 @@
 # 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 
 
 # python-pycurl and python-psycopg2 avail. from fedora 5
 # we used to ship our own version of psycopg2 and pycurl, for fedora4
@@ -51,8 +52,8 @@ index-clean:
 	rm $(init)
 
 #################### regenerate indexes - not used by the build, as both files are svn added - please update as appropriate
-# All .py files in PLC/
 
+########## PLC/
 # the current content of __init__.py
 PLC_now := $(sort $(shell fgrep -v '"' PLC/__init__.py 2>/dev/null))
 # what should be declared
@@ -63,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
@@ -76,7 +77,9 @@ 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()') > $@
+
+##########
 
 force:
 
@@ -88,11 +91,22 @@ tags:
 
 .PHONY: tags
 
-########## make sync PLCHOST=hostname VSERVER=vservername
-ifdef PLCHOST
-ifdef VSERVER
-PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER)
+########## 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=testplc.onelab.eu GUEST=vplc03.inria.fr
+
+PLCHOST ?= testplc.onelab.eu
+
+ifdef GUEST
+SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
+SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
 endif
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -101,12 +115,16 @@ 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 PLCHOST and VSERVER on the command line"
-	echo " e.g. make sync PLCHOST=private.one-lab.org VSERVER=myplc01" ; exit 1
+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=testplc.onelab.eu GUEST=vplc03.inria.fr"
+	@exit 1
 else
-	+$(RSYNC) PLC planetlab5.sql migrations $(PLCSSH)/usr/share/plc_api/
-	ssh root@$(PLCHOST) vserver $(VSERVER) exec apachectl graceful
+	+$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
+	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+	$(SSHCOMMAND) exec apachectl graceful
 endif
 
 #################### convenience, for debugging only