X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=87d89230d68f2da9d54a3565aef00e7f939dbbdb;hb=refs%2Fheads%2Fplanetstack;hp=c9e0d916a02da461e02319791768f47aedf19661;hpb=6c6b41cc95241c2074d1cb1dac2b85b888824ae5;p=nodemanager.git

diff --git a/Makefile b/Makefile
index c9e0d91..87d8923 100644
--- a/Makefile
+++ b/Makefile
@@ -5,29 +5,62 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.2 2006/11/13 20:04:44 mlhuang Exp $
-#
 
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
 
-all: forward_api_calls
-	python setup.py build
+install: install-lib install-lxc install-planetstack install-scripts
+
+lib:
+	python setup-lib.py build
+
+lxc: 
+	python setup-lxc.py build
 
-forward_api_calls: forward_api_calls.c
-	$(CC) -Wall -Os -o $@ $?
-	strip $@
+planetstack: 
+	python setup-planetstack.py build
+
+install-lib:
+	python setup-lib.py install \
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
+	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
-install:
-	python setup.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-scripts=$(DESTDIR)/$(bindir)
+install-lxc:
+	python setup-lxc.py install \
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
+install-planetstack:
+	python setup-planetstack.py install \
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
+
+install-scripts: 
+	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
+	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
+	chmod 755 $(DESTDIR)/$(datadir)/sliver-initscripts/
+
+	mkdir -p $(DESTDIR)/etc/init.d
+	chmod 755 initscripts/*
+	rsync -av initscripts/ $(DESTDIR)/etc/init.d/
+
+	install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+
+	install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
+	install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
+
+
 clean:
-	python setup.py clean
+	python setup-lib.py clean
+	python setup-vs.py clean
+	python setup-lxc.py clean
+	python setup-planetstack.py clean
 	rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
@@ -40,8 +73,17 @@ tags:
 
 ########## sync
 # for use with the test framework; push local stuff on a test node
-# make sync NODE=vnode01.inria.fr
-# specify TESTMASTER and BUILD if the key is not available yet
+# howto use: go on testmaster in the build you want to use and just run
+# $ exp
+# cut'n paste the result in a terminal in your working dir, e.g. (although all are not required)
+# $ export BUILD=2013.07.02--lxc18
+# $ export PLCHOSTLXC=gotan.pl.sophia.inria.fr
+# $ export GUESTNAME=2013.07.02--lxc18-1-vplc01
+# $ export GUESTHOSTNAME=vplc01.pl.sophia.inria.fr
+# $ export KVMHOST=kvm64-6.pl.sophia.inria.fr
+# $ export NODE=vnode01.pl.sophia.inria.fr
+# and then just run
+# $ make sync
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
 RSYNC_EXCLUDES		:= --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
@@ -58,7 +100,8 @@ ifeq (,$(NODEURL))
 	@echo "  e.g. make sync NODE=vnode01.inria.fr"
 	@exit 1
 else
-	+$(RSYNC) ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) --exclude sshsh ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) ./sshsh $(NODEURL)/bin/
 	+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
 	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
 endif
@@ -83,16 +126,3 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
-
-### utility - find out the node name for a given BUILD
-
-ifdef BUILD
-NODEIPCOMMAND:=ssh root@$(TESTMASTER) cat $(BUILD)/arg-ips-node
-endif
-
-nodename:
-ifeq (,$(NODEIPCOMMAND))
-	@echo "nodename: You must define TESTMASTER and BUILD on the command line"
-else
-	$(NODEIPCOMMAND)
-endif