X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=ed75dce9f6789d5e5bdbf744be0b24b2371414bd;hb=88cae0b8c15eb7f893682c8b63c845a2fc5969da;hp=390d107e39246f07bdd51013e96793f69e93eaf4;hpb=1fe505c2263ccc9bcb9b9235984edec6fdd23b55;p=plcapi.git diff --git a/Makefile b/Makefile index 390d107..ed75dce 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ 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()') > $@ + echo "This step is obsolete" ########## Methods/ # the current content of __init__.py @@ -77,7 +77,7 @@ 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()') > $@ + echo "This step is obsolete" ########## @@ -96,7 +96,7 @@ 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 @@ -118,10 +118,12 @@ 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 " or make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr" @exit 1 else +$(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