git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
[sfa.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
547fcf7
..
06f184c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,39
+5,31
@@
DESTDIR="/"
##########
DESTDIR="/"
##########
-#all: keyconvert python wsdl
-# turn off wsdl generation until it is fixed
-all: keyconvert python
+all: python wsdl
-install:
keyconvert-install python-install wsdl-install
+install:
python-install wsdl-install xmlbuilder-install
-clean:
keyconvert-clean
python-clean wsdl-clean
+clean: python-clean wsdl-clean
-.PHONY: all install clean
-
-##########
-keyconvert:
- $(MAKE) -C keyconvert
-
-keyconvert-install:
- $(MAKE) -C keyconvert install
+uninstall: python-uninstall
-keyconvert-clean:
- $(MAKE) -C keyconvert clean
-
-.PHONY: keyconvert keyconvert-install keyconvert-clean
+.PHONY: all install clean
##########
python:
##########
python:
+xmlbuilder-install:
+ cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+
python-install:
python-install:
- python setup.py install --root=$(DESTDIR)
+ python setup.py install --root=$(DESTDIR)
+ chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
python-clean:
python setup.py clean
rm $(init)
python-clean:
python setup.py clean
rm $(init)
-.PHONY: python python-install python-clean
+.PHONY: python python-install python-clean
xmlbuilder-install
##########
wsdl:
$(MAKE) -C wsdl
##########
wsdl:
$(MAKE) -C wsdl
@@
-54,7
+46,7
@@
wsdl-clean:
# are the .java files used ?
tags:
# are the .java files used ?
tags:
- find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+ find . -type f | egrep -v '/\.
git/|/\.
svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
.PHONY: tags
.PHONY: tags
@@
-65,6
+57,8
@@
tags:
# (*) otherwise, entering through the root context
# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
# (*) otherwise, entering through the root context
# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+PLCHOST ?= testplc.onelab.eu
+
ifdef GUEST
ifdef PLCHOST
SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
ifdef GUEST
ifdef PLCHOST
SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
@@
-77,14
+71,14
@@
SSHCOMMAND:=ssh root@$(PLC)
endif
LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc'
endif
LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc'
-RSYNC_EXCLUDES := --exclude .svn --exclude
CVS
--exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES := --exclude .svn --exclude
.git
--exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN)
--no-owner
$(RSYNC_EXCLUDES)
-BINS = ./config/sfa-config-tty ./
sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc
.py \
- ./sfa/server/sfa-server.py \
+BINS = ./config/sfa-config-tty ./
config/gen-sfa-cm-config
.py \
+ ./sfa/
plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/
server/sfa-server.py \
./sfa/client/sfi.py ./sfa/client/getNodes.py ./sfa/client/getRecord.py \
./sfa/client/sfi.py ./sfa/client/getNodes.py ./sfa/client/getRecord.py \
- ./sfa/client/setRecord.py ./sfa/client/
geni
dump.py
+ ./sfa/client/setRecord.py ./sfa/client/
sfa
dump.py
sync:
ifeq (,$(SSHURL))
sync:
ifeq (,$(SSHURL))