X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=b137434ce21442200165d0e3c4817b46f5b600c8;hb=f9cc5266ed55ce904a26fcf86e5c4e466bf52871;hp=625a662a7df79e0d930e601be7e25915f28af878;hpb=85eed099b072453c48f9c1d4fde030aed4b22032;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 625a662..b137434 100644
--- a/Makefile
+++ b/Makefile
@@ -5,28 +5,115 @@
 # 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
+lib: forward_api_calls
+	python setup-lib.py build
+
+vs: 
+	python setup-vs.py build
+
+lxc: 
+	python setup-lxc.py build
 
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
 
-install:
-	python setup.py install \
+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-vs:
+	python setup-vs.py install \
 	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
 	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
 	    --install-scripts=$(DESTDIR)/$(bindir)
+	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
+
+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
 
 clean:
-	python setup.py clean
-	rm -f forward_api_calls *.pyc
+	python setup-lib.py clean
+	python setup-vs.py clean
+	python setup-lxc.py clean
+	rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
+
+##########
+tags:
+	(find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' ; ls initscripts/*) | xargs etags 
+
+.PHONY: 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
+
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
+RSYNC_EXCLUDES		:= --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
+RSYNC			:= rsync -e "ssh -i $(NODE).key.rsa" -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+
+ifdef NODE
+NODEURL:=root@$(NODE):/
+endif
+
+sync: $(NODE).key.rsa
+ifeq (,$(NODEURL))
+	@echo "sync: You must define NODE on the command line"
+	@echo "  e.g. make sync NODE=vnode01.inria.fr"
+	@exit 1
+else
+	+$(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
+
+### fetching the key
+
+TESTMASTER ?= testmaster.onelab.eu
+
+ifdef BUILD
+KEYURL:=root@$(TESTMASTER):$(BUILD)/keys/key_admin.rsa
+endif
+
+key: $(NODE).key.rsa
+
+$(NODE).key.rsa:
+ifeq (,$(KEYURL))
+	@echo "sync: fetching $@ - You must define TESTMASTER, BUILD and NODE on the command line"
+	@echo "  e.g. make sync TESTMASTER=testmaster.onelab.eu BUILD=2010.01.22--1l-f8-32 NODE=vnode01.inria.fr"
+	@echo "  note that for now all test builds use the same key, so any BUILD would do"
+	@exit 1
+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