removed another bunch of references to geni

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index a4377a8..1ad12d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@
 DESTDIR="/"
 
 ##########
-all: keyconvert python
+all: keyconvert python wsdl
 
-install: keyconvert-install python-install
+install: keyconvert-install python-install wsdl-install
 
-clean: keyconvert-clean python-clean
+clean: keyconvert-clean python-clean wsdl-clean
 
 .PHONY: all install clean 
 
@@ -26,10 +26,11 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: index
+python: 
 
 python-install:
-       python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
+       python setup.py install --root=$(DESTDIR)
+       chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 
 python-clean:
        python setup.py clean
@@ -37,54 +38,24 @@ python-clean:
 
 .PHONY: python python-install python-clean
 ##########
+wsdl: 
+       $(MAKE) -C wsdl 
 
-# are the .java files used ?
-tags:  
-       find . -name '*.py' -o -name '*.sh' -o -name '*.ecore'  | grep -v '/\.svn/' | xargs etags
-.PHONY: tags
-
-
-########## indexes
-init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py 
-
-force:
-.PHONY: force 
-
-index: $(init)
-.PHONY: index
-
-geni/__init__.py:
-       (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
-
-geni/methods/__init__.py:
-       (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni/methods; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+# propagate DESTDIR from the specfile
+wsdl-install:
+       $(MAKE) -C wsdl install 
 
-geni/util/__init__.py:
-       (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni/util; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
+wsdl-clean:
+       $(MAKE) -C wsdl clean
 
-geni_now := $(sort $(shell fgrep -v '"' geni/__init__.py 2>/dev/null))
-# what should be declared
-geni_paths := $(filter-out %/__init__.py, $(wildcard geni/*.py))
-geni_files := $(sort $(notdir $(geni_paths:.py=)))
-ifneq ($(geni_now), $(geni_files))
-geni/__init__.py: force
-endif
+.PHONY: wsdl wsdl-install wsdl-clean
+##########
 
-methods_now := $(sort $(shell fgrep -v '"' geni/methods/__init__.py 2>/dev/null))
-# what should be declared
-method_paths := $(filter-out %/__init__.py, $(wildcard geni/methods/*.py))
-method_files := $(sort $(notdir $(method_paths:.py=)))
-ifneq ($(methods_now), $(methods_files))
-geni/methods/__init__.py: force
-endif
+# are the .java files used ?
+tags:  
+       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
+.PHONY: tags
 
-util_now := $(sort $(shell fgrep -v '"' geni/util/__init__.py 2>/dev/null))
-# what should be declared
-util_paths := $(filter-out %/__init__.py, $(wildcard geni/util/*.py))
-util_files := $(sort $(notdir $(util_paths:.py=)))
-ifneq ($(util_now), $(util_files))
-geni/util/__init__.py: force
-endif
 
 ########## sync
 # 2 forms are supported
@@ -109,6 +80,11 @@ RSYNC_EXCLUDES              := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+BINS = ./config/sfa-config-tty ./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/setRecord.py ./sfa/client/sfadump.py
+
 sync:
 ifeq (,$(SSHURL))
        @echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
@@ -116,8 +92,9 @@ ifeq (,$(SSHURL))
        @echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
        @exit 1
 else
-       +$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/
-       +$(RSYNC) geni-config-tty $(SSHURL)/usr/bin
+       +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
+       +$(RSYNC)  $(BINS) $(SSHURL)/usr/bin
+       $(SSHCOMMAND) exec service sfa restart
 endif
 
 .PHONY: sync