X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=Makefile;h=775df166e5267715c685050990564a0e7ef90563;hp=9f819f44d83da733d31d5c4ef5e251ba3d5a2b5a;hb=0780b094a2f0b24ec24f8156e0e3548f3c05373b;hpb=391310e122de0536c08f62bd46acd3b3b7b13964

diff --git a/Makefile b/Makefile
index 9f819f4..775df16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,30 @@
-# 
-# $Id: Makefile 1078 2007-11-15 13:38:27Z thierry $
-#
+##########
+tags:
+	find . -type f | egrep -v '\.git/|~$$' | xargs etags
 
-BINARIES = plc-config plc-config-tty db-config dns-config refresh-peer.py plc-map.py clean-empty-dirs.py mtail.py
-INIT_SCRIPTS = api bootcd bootmanager crond db dns functions gpg httpd mail network packages postgresql ssh ssl syslog
+.PHONY: tags
 
-INITS=$(addprefix plc.d/,$(INIT_SCRIPTS))
+########## 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
 
-########## make sync PLCHOST=hostname
-ifdef PLCHOST
-PLCSSH:=root@$(PLCHOST)
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+else
+ifdef PLCHOSTVS
+SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
+endif
+endif
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -18,20 +33,29 @@ 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 target host as PLCHOST on the command line"
-	echo " e.g. make sync PLCHOST=private.one-lab.org" ; exit 1
+ifeq (,$(SSHURL))
+	@echo "sync: I need more info from the command line, e.g."
+	@echo "  make sync PLC=boot.planetlab.eu"
+	@echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
+	@exit 1
 else
-	+$(RSYNC) host.init $(PLCSSH):/etc/init.d/plc
-	+$(RSYNC) guest.init $(PLCSSH):/plc/root/etc/init.d/plc
-	+$(RSYNC) $(BINARIES) $(PLCSSH):/plc/root/usr/bin
-	+$(RSYNC) $(INITS) $(PLCSSH):/plc/root/etc/plc.d
-	+$(RSYNC) plc_config.py $(PLCSSH):/plc/root/usr/lib/python2.4/site-packages/plc_config.py
-	+$(RSYNC) default_config.xml $(PLCSSH):/plc/data/etc/planetlab/default_config.xml
-	@echo XXXXXXXX You might consider running the following command
-	@echo ssh $(PLCSSH) chroot /plc/root service plc start 
+	+$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc
+	+$(RSYNC) bin/ $(SSHURL)/usr/bin/
+	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+	+$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/plc_config.py
+	+$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml
+	@echo XXXXXXXX you might need to run ssh root@$(PLC) service plc start 
 endif
 
+#################### 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))"
 
-tags:
-	find . -type f | egrep -v '.svn/|~$$' | xargs etags