X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=b137434ce21442200165d0e3c4817b46f5b600c8;hb=0bba1275cfbe21f44144b82ad644105709671dbf;hp=1a555990db113fd9432c70af385277d7f28986c7;hpb=12c74117e7e48984c7fa26617c321bd445a3c4fb;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 1a55599..b137434 100644
--- a/Makefile
+++ b/Makefile
@@ -5,36 +5,56 @@
 # 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
+	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' ')' | xargs etags 
+	(find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' ; ls initscripts/*) | xargs etags 
 
 .PHONY: tags
 
@@ -44,7 +64,7 @@ tags:
 # specify TESTMASTER and BUILD if the key is not available yet
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+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)
 
@@ -58,8 +78,10 @@ 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
 
 ### fetching the key
@@ -67,9 +89,11 @@ endif
 TESTMASTER ?= testmaster.onelab.eu
 
 ifdef BUILD
-KEYURL:=root@$(TESTMASTER):$(BUILD)/keys/key1.rsa
+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"
@@ -77,7 +101,8 @@ ifeq (,$(KEYURL))
 	@echo "  note that for now all test builds use the same key, so any BUILD would do"
 	@exit 1
 else
-	scp $(KEYURL) $@
+	@echo "FETCHING key"
+	+scp $(KEYURL) $@
 endif
 
 ### utility - find out the node name for a given BUILD