Setting tag myplc-7.0-0

[myplc.git] / Makefile

diff --git a/Makefile b/Makefile
index 47c65d8..dc89c4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,27 +12,18 @@ tags:
 # $ run export
 # and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
-
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
-ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOST):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/
 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' 
-RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc'
+RSYNC_EXCLUDES         := --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC                  := rsync -ai $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
 ifeq (,$(SSHURL))
@@ -42,13 +33,14 @@ ifeq (,$(SSHURL))
        @echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
        @exit 1
 else
-       +$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc
+       +$(RSYNC) systemd/plc-ctl $(SSHURL)/usr/bin/plc-ctl
+       +$(RSYNC) systemd/plc.service $(SSHURL)/usr/lib/systemd/system/plc.service
        +$(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) plc_config.py $(SSHURL)/usr/lib\*/python3.\*/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 
+       @echo XXXXXXXX you might need to run $(SSHCOMMAND) service plc start
 endif
 
 #################### convenience, for debugging only
@@ -60,4 +52,3 @@ endif
 +%: varname=$(subst +,,$@)
 +%:
        @echo "$($(varname))"
-