From 6f1e5639a8651435ac6746b19f911ea1ace344f7 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Thu, 23 May 2013 01:05:15 -0400 Subject: [PATCH] Tweak top-level executables to support DYNAHOME While tweaking things, take tests out of all target in Makefile --- Makefile | 2 +- debug | 2 +- dyna | 2 +- src/Dyna/Backend/Python/debug.py | 11 +++++------ src/Dyna/Backend/Python/interpreter.py | 5 +++-- src/Dyna/Backend/Python/utils.py | 1 + 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b083392..2d58658 100644 --- 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 69ac8ec..6096ba1 100755 --- 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 2794e6c..d0549fa 100755 --- 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 4585a3b..6bcd5cc 100644 --- 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, '
' print >> html, '
' - # 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 5544120..6ebb2ac 100644 --- 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 aa54339..91a3f8e 100644 --- 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): """ -- 2.50.1