X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=Makefile;h=0b57cd1f21738e13a96dfe070e1a184258c1ce4d;hp=2b7042ad2499eb31c853277a2fae23fc811fc675;hb=HEAD;hpb=d0d9c8991b09ae316878d8e6cb30ed1536574f63

diff --git a/Makefile b/Makefile
index 2b7042a..0b57cd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,23 @@
-# 
-# $Id$
-#
-
-BINARIES = plc-config plc-config-tty db-config dns-config plc-map.py plc-kml.py clean-empty-dirs.py mtail.py \
-	support-scripts/renew_reminder.py support-scripts/gen_aliases.py
-INIT_SCRIPTS = api bootcd bootmanager crond db dns functions gpg httpd mail network packages postgresql ssh ssl syslog
+##########
+tags:
+	find . -type f | egrep -v '\.git/|~$$' | xargs etags
 
-INITS=$(addprefix plc.d/,$(INIT_SCRIPTS))
+.PHONY: tags
 
-########## make sync PLCHOST=hostname
-ifdef PLCHOST
-ifdef VSERVER
-PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER)
-endif
+########## 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
+
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
+else
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -21,21 +26,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 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: 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) guest.init $(PLCSSH)/etc/init.d/plc
-	+$(RSYNC) $(BINARIES) $(PLCSSH)/usr/bin
-	+$(RSYNC) $(INITS) $(PLCSSH)/etc/plc.d
-	+$(RSYNC) plc_config.py $(PLCSSH)/usr/lib/python2.5/site-packages/plc_config.py
-	+$(RSYNC) default_config.xml $(PLCSSH)/etc/planetlab/default_config.xml
-	@echo XXXXXXXX You might consider running the following command
-	@echo ssh $(PLCHOST) 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 $(SSHCOMMAND) 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
-
-.PHONY: tags