needed renamings

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index a4dff17..2c564a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,57 @@
 #
 ## (Re)builds Python metafile (__init__.py) and documentation
-#
 # 
-# Meta
-init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py 
+# overwritten by the specfile
+DESTDIR="/"
 
-subdirs := keyconvert #pyOpenSSL-0.9
- 
-all: install $(init) $(subdirs)
+##########
+all: keyconvert python
 
-install: 
-       python setup.py install
+install: keyconvert-install python-install
 
-$(subdirs): $(init)
+clean: keyconvert-clean python-clean
 
-$(subdirs): %:
-       $(MAKE) -C $@
+.PHONY: all install clean 
 
-clean:
-       python setup.py uninstall
-       cd keyconvert && make clean
-       cd - 
-       # XX remove keyconvert   
+##########
+keyconvert:
+       $(MAKE) -C keyconvert
 
-index: $(init)
+keyconvert-install:
+       $(MAKE) -C keyconvert install
+
+keyconvert-clean:
+       $(MAKE) -C keyconvert clean
+
+.PHONY: keyconvert keyconvert-install keyconvert-clean 
+
+##########
+python: index
 
-index-clean:
+python-install:
+       python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
+
+python-clean:
+       python setup.py clean
        rm $(init)
 
-.phony: all install force clean index $(subdirs)
+.PHONY: python python-install python-clean
+##########
+
+# 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()') > $@
@@ -63,6 +86,40 @@ ifneq ($(util_now), $(util_files))
 geni/util/__init__.py: force
 endif
 
-force:
+########## sync
+# 2 forms are supported
+# (*) if your plc root context has direct ssh access:
+# make sync PLC=private.one-lab.org
+# (*) otherwise, entering through the root context
+# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+
+ifdef GUEST
+ifdef PLCHOST
+SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
+SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
+endif
+endif
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
+endif
+
+LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
+RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
+RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+
+sync:
+ifeq (,$(SSHURL))
+       @echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
+       @echo "  e.g. make sync PLC=private.one-lab.org"
+       @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) ./config/geni-config-tty $(SSHURL)/usr/bin
+       $(SSHCOMMAND) exec service geni restart
+endif
 
-.PHONY: all install force clean index tags $(subdirs)
+.PHONY: sync
+##########