X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=034846f4c396d2f5f2a9c70c48b2b5a98078c15b;hb=5defaa08727931fdfd6a1c0e007a5795dbc89af6;hp=e20b903a9b612b9a4f7e0002ff10e9cdd674f894;hpb=177ab4444e26220ac6b5d74d85af412a6b8ba72a;p=plcapi.git

diff --git a/Makefile b/Makefile
index e20b903..034846f 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 PLC/Legacy/__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
@@ -63,7 +64,7 @@ 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
@@ -76,25 +77,10 @@ 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()') > $@
-
-########## 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 '# each module to define in "methods" the set of methods that it defines' ;\
-	 echo '__all__ = """' ; \
-	 cd PLC/Legacy; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; \
-	 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:
 
 .PHONY: all install force clean index tags $(subdirs)
@@ -110,14 +96,14 @@ tags:
 # (*) 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
+# make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr
+
+PLCHOST ?= testplc.onelab.eu
 
 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)
@@ -131,11 +117,12 @@ 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"
+	@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 $(SSHURL)/usr/share/plc_api/
+	+$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
+	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
 	$(SSHCOMMAND) exec apachectl graceful
 endif