X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=4c148c990d174d0fdfd5ed407d77685248ed91b9;hb=527f3958dd2c3b65f1ccb68c496656cda3b3b223;hp=63e0255a5359bc65ba1ab439059b4dc1a0779ffd;hpb=699667b3e734e954b0c93fbb2a6c29d82246d1dd;p=sfa.git

diff --git a/Makefile b/Makefile
index 63e0255a..4c148c99 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ python-install:
 	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations
-	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan)
+	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan; ln -s sfaadmin.py sfaadmin)
 
 python-clean: version-clean
 	python setup.py clean
@@ -61,6 +61,12 @@ wsdl-clean:
 
 .PHONY: wsdl wsdl-install wsdl-clean
 
+##########
+debian: version
+	$(MAKE) -f Makefile.debian debian
+debian.clean: 
+	$(MAKE) -f Makefile.debian clean
+
 ##########
 tests-install:
 	mkdir -p $(DESTDIR)/usr/share/sfa/tests
@@ -96,7 +102,7 @@ force:
 ##########
 # a lot of stuff in the working dir is just noise
 scan:
-	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg)$$' 
+	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' 
 tags:	
 	$(MAKE) scan | xargs etags
 
@@ -110,20 +116,32 @@ signatures:
 # 2 forms are supported
 # (*) 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
-
-PLCHOST ?= testplc.onelab.eu
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-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)
+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
+
+synccheck: 
+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
 endif
 
 LOCAL_RSYNC_EXCLUDES	+= --exclude '*.pyc' 
@@ -132,24 +150,15 @@ RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-CLIENTS = $(shell ls sfa/clientbin/*.py)
+CLIENTS = $(shell ls clientbin/*.py)
 
 BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
 	./sfa/server/sfa-start.py \
-	./sfa/importer/sfa-import.py ./sfa/importer/sfa-nuke.py \
+	./clientbin/sfaadmin.py \
 	$(CLIENTS)
 
-synccheck: 
-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"
-	@exit 1
-endif
-
-
 synclib: synccheck
-	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+	+$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python2.\*/site-packages/
 syncbin: synccheck
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
 syncinit: synccheck
@@ -159,7 +168,7 @@ syncconfig:
 synctest: synccheck
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 syncrestart: synccheck
-	$(SSHCOMMAND) exec service sfa restart
+	$(SSHCOMMAND) service sfa restart
 
 syncmig:
 	+$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/
@@ -172,12 +181,6 @@ syncfast: synclib syncrestart
 
 .PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast
 
-syncrica: synccheck
-	+$(RSYNC) --relative ./sfa/fd ./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
-	$(SSHCOMMAND) exec service sfa restart
-
-.PHONY: syncrica
-
 ##########
 CLIENTLIBFILES= \
 sfa/examples/miniclient.py \