Tweak top-level executables to support DYNAHOME

While tweaking things, take tests out of all target in Makefile

diff --git a/Makefile b/Makefile
index b083392241c193a7f11e410bf529dd8dfd2d52c6..2d58658f02e23d7df4d0a4c2c110505943f7dcb7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,10 @@ deps:
 build:
        cabal configure --user --enable-tests
        cabal build
-       cabal test
 
 tests:
        dist/build/dyna-selftests/dyna-selftests
+       # cabal test
 
 .PHONY: clean veryclean
 clean:

diff --git a/debug b/debug
index 69ac8ecc1cb39a828a2eb7cc300250944138e460..6096ba11b6a71beab10661db23019900f9c47441 100755 (executable)
--- a/debug
+++ b/debug
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-python src/Dyna/Backend/Python/debug.py $@
+exec python ${DYNAHOME:-.}/src/Dyna/Backend/Python/debug.py $@

diff --git a/dyna b/dyna
index 2794e6c504047fbf2e52a71d6c6ae2db09dbafaa..d0549fa92e06e92ac31ceb29c2fd11edf992f0e6 100755 (executable)
--- a/dyna
+++ b/dyna
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-python src/Dyna/Backend/Python/interpreter.py $@
+exec python ${DYNAHOME:-.}/src/Dyna/Backend/Python/interpreter.py $@

diff --git a/src/Dyna/Backend/Python/debug.py b/src/Dyna/Backend/Python/debug.py
index 4585a3b8de7fd44d77f6d8dae7a23c0a763c10ec..6bcd5ccb83ce2cfb8ea295afa537f3c3b9920a7a 100644 (file)
--- a/src/Dyna/Backend/Python/debug.py
+++ b/src/Dyna/Backend/Python/debug.py
@@ -6,14 +6,14 @@ normalization process.
 
 import re, os, shutil
 from collections import defaultdict, namedtuple
-from utils import magenta, red, green, yellow, white, read_anf
+from utils import magenta, red, green, yellow, white, read_anf, dynahome
 
 from pygments import highlight
 from pygments.lexers import get_lexer_by_name
 from pygments.formatters import HtmlFormatter
 
-cssfile="src/Dyna/Backend/Python/debug-pygments.css"
-jsfile="external/prototype-1.6.0.3.js"
+cssfile="%s/src/Dyna/Backend/Python/debug-pygments.css" % dynahome
+jsfile="%s/external/prototype-1.6.0.3.js" % dynahome
 
 Edge = namedtuple('Edge', 'head label body')  # "body" is sometimes called the "tail"
 
@@ -286,12 +286,11 @@ function selectline(lineno) {
         print >> html, '<div id="dopamine-pane" style=""></div>'
         print >> html, '<div id="update-handler-pane" style=""></div>'
 
-        # XXX We do not yet render the dumped dopamine, but it's there...
-        cmd = """dist/build/dyna/dyna -B python \
+        cmd = """%s/dist/build/dyna/dyna -B python \
 --dump-anf="%s"/anf \
 --dump-dopini="%s"/dopini \
 --dump-dopupd="%s"/dopupd \
--o "%s"/plan "%s" """ % (d,d,d,d,dynafile)
+-o "%s"/plan "%s" """ % (dynahome,d,d,d,d,dynafile)
         if 0 != os.system(cmd):
             print 'command failed:\n\t' + cmd
             os.system('gnome-open %s 2>/dev/null >/dev/null' % html.name)

diff --git a/src/Dyna/Backend/Python/interpreter.py b/src/Dyna/Backend/Python/interpreter.py
index 5544120e6cc378f8dbf9ef3a1cc017998abfd605..6ebb2accb736c3fd38a34efb66a4adcb3c77716c 100644 (file)
--- a/src/Dyna/Backend/Python/interpreter.py
+++ b/src/Dyna/Backend/Python/interpreter.py
@@ -31,7 +31,7 @@
 import os, sys
 from collections import defaultdict
 from argparse import ArgumentParser
-from utils import ip, red, green, blue, magenta
+from utils import ip, red, green, blue, magenta, dynahome
 from defn import agg_bind
 
 
@@ -325,7 +325,8 @@ def go():
 
 
 def dynac(f):
-    cmd = """dist/build/dyna/dyna -B python -o "%s".plan "%s" """ % (f,f)
+    cmd = """%s/dist/build/dyna/dyna -B python -o "%s".plan "%s" """ \
+          % (dynahome,f,f)
     assert 0 == os.system(cmd), 'command failed:\n\t' + cmd
     return f + '.plan'
 

diff --git a/src/Dyna/Backend/Python/utils.py b/src/Dyna/Backend/Python/utils.py
index aa543392222ac255b7efc5aaa5d646be758d57f0..91a3f8e631293620515eb0df147878131328bc5d 100644 (file)
--- a/src/Dyna/Backend/Python/utils.py
+++ b/src/Dyna/Backend/Python/utils.py
@@ -6,6 +6,7 @@ ip = InteractiveShellEmbed(banner1 = 'Dropping into IPython\n')
 black, red, green, yellow, blue, magenta, cyan, white = \
     map('\033[3%sm%%s\033[0m'.__mod__, range(8))
 
+dynahome = os.getenv('DYNAHOME', '.')
 
 def parse_sexpr(e):
     """