diff options
| -rw-r--r-- | sm/assemble_x.sm | 6 | ||||
| -rw-r--r-- | sm/build_dev.sm | 4 | ||||
| -rw-r--r-- | sm/build_x.sm | 12 | ||||
| -rw-r--r-- | steuermann/config.py | 2 | ||||
| -rw-r--r-- | steuermann/nodes.py | 3 | ||||
| -rw-r--r-- | steuermann/run_all.py | 2 |
6 files changed, 25 insertions, 4 deletions
diff --git a/sm/assemble_x.sm b/sm/assemble_x.sm index 68089c7..a29f4fa 100644 --- a/sm/assemble_x.sm +++ b/sm/assemble_x.sm @@ -20,3 +20,9 @@ TABLE assemble HOST arzach CMD x.irafx_age RUN "irafx_age.py" AFTER init/* +TABLE assemble HOST jwcalibdev + + CMD x.jwst RUN "assemble_jwst x" + AFTER init/* + AFTER *:svnsync + diff --git a/sm/build_dev.sm b/sm/build_dev.sm index 9c447f7..0935d01 100644 --- a/sm/build_dev.sm +++ b/sm/build_dev.sm @@ -90,9 +90,9 @@ TABLE build HOST arzach cadeau banana jwcalibdev CMD dev.jwst RUN "build_jwst dev" AFTER init/* AFTER *:assemble/dev.jwst - AFTER build/dev.py2.7.1 + AFTER build/dev.py2.7.* TABLE build HOST jwcalibdev - CMD dev.jwst_docs RUN "build_jwst_docs" + CMD dev.jwst_docs RUN "build_jwst_docs dev" AFTER dev.jwst diff --git a/sm/build_x.sm b/sm/build_x.sm index 70848f8..28eaf30 100644 --- a/sm/build_x.sm +++ b/sm/build_x.sm @@ -51,3 +51,15 @@ TABLE stamp HOST herbert thor arzach bond cadeau banana CMD x RUN "build_stamp x" AFTER build/* +# jwst irafx + +TABLE build HOST arzach cadeau banana jwcalibdev + CMD x.jwst RUN "build_jwst x" + AFTER init/* + AFTER *:assemble/x.jwst + AFTER build/x.py2.7.* + +TABLE build HOST jwcalibdev + CMD x.jwst_docs RUN "build_jwst_docs x" + AFTER x.jwst + diff --git a/steuermann/config.py b/steuermann/config.py index f65a365..b10881b 100644 --- a/steuermann/config.py +++ b/steuermann/config.py @@ -1,4 +1,4 @@ -db_creds = 'steuermann.db' +db_creds = '/ssbwebv1/data2/steuermann/steuermann.db' def open_db() : import sqlite3 diff --git a/steuermann/nodes.py b/steuermann/nodes.py index c7d4262..cfab1c0 100644 --- a/steuermann/nodes.py +++ b/steuermann/nodes.py @@ -268,6 +268,8 @@ def c_d_fn(x,depth) : print "error: loop detected at",x.name return + print '>'," "*depth, depth, x.name + # if it is already deeper than where we are now, we can (must) # prune the tree walk here. if x.depth >= depth : @@ -288,6 +290,7 @@ def c_d_fn(x,depth) : for y in x.successors : c_d_fn(y,depth) + print '<'," "*depth, depth, x.name x.in_recursion = 0 def compute_depths(nodes) : diff --git a/steuermann/run_all.py b/steuermann/run_all.py index 35d9738..c3ed796 100644 --- a/steuermann/run_all.py +++ b/steuermann/run_all.py @@ -148,7 +148,7 @@ def cmd_flagging( l, xnodes, func ) : # def print_node(xnodes, x, print_recursive, print_all, indent=0, print_cmd=1): - print ' '*indent, xnodes[x].wanted, xnodes[x].finished, xnodes[x].skip, x + print ' '*indent, xnodes[x].wanted, xnodes[x].finished, xnodes[x].skip, xnodes[x].depth, x if print_cmd : print ' '*indent, " CMD", xnodes[x].script_type, xnodes[x].script if print_all : |