diff options
| -rw-r--r-- | sm/build_dev.sm | 15 | ||||
| -rw-r--r-- | sm/build_x.sm | 2 | ||||
| -rw-r--r-- | sm/dist_dev.sm | 13 | ||||
| -rw-r--r-- | sm/test_dev.sm | 6 | ||||
| -rw-r--r-- | sm/test_x.sm | 4 |
5 files changed, 15 insertions, 25 deletions
diff --git a/sm/build_dev.sm b/sm/build_dev.sm index 96e9ecb..b67e46a 100644 --- a/sm/build_dev.sm +++ b/sm/build_dev.sm @@ -8,7 +8,10 @@ # build hstcal # - everywhere TABLE build HOST herbert thor arzach bond cadeau banana jwcalibdev - CMD dev.py2.7 RUN "build_stsci_python dev 2.7" + CMD dev.py2.7.1 RUN "build_stsci_python dev 2.7.1" + AFTER init/* + AFTER *:assemble/dev.stsci_python + CMD dev.py2.7.3 RUN "build_stsci_python dev 2.7.3" AFTER init/* AFTER *:assemble/dev.stsci_python CMD dev.hstcal RUN "build_hstcal dev" @@ -16,7 +19,7 @@ TABLE build HOST herbert thor arzach bond cadeau banana jwcalibdev AFTER *:assemble/dev.hstcal TABLE build HOST vxp-dukat - CMD dev.py2.7 RUN "build_stsci_python" + CMD dev.py2.7.1 RUN "build_stsci_python" AFTER init/* AFTER *:assemble/dev.stsci_python @@ -60,14 +63,14 @@ TABLE build HOST cadeau banana # stsci_python documentation # - one machine only TABLE build HOST arzach - CMD dev.stsci_python_sphinxdocs RUN "build_sphinxdocs dev 2.7" - AFTER build/dev.py2.7 + CMD dev.stsci_python_sphinxdocs RUN "build_sphinxdocs dev 2.7.1" + AFTER build/dev.py2.7.1 # old epydoc documentation - only works on thor; hope we can get rid of # epydoc sooner than we have to do anything about this. TABLE build HOST thor CMD dev.stsci_python_epydoc RUN "/thor/data2/iraf/epydoc_test/nightly" - AFTER build/dev.py2.7 + AFTER build/dev.py2.7.1 # stamp the IRAF banner file when the builds are complete TABLE stamp HOST herbert thor arzach bond cadeau banana jwcalibdev @@ -79,7 +82,7 @@ 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 + AFTER build/dev.py2.7.1 CMD dev.jwst_docs RUN "build_jwst_docs" AFTER dev.jwst diff --git a/sm/build_x.sm b/sm/build_x.sm index 574db25..70848f8 100644 --- a/sm/build_x.sm +++ b/sm/build_x.sm @@ -8,7 +8,7 @@ # build hstcal # - everywhere TABLE build HOST herbert thor arzach bond cadeau banana - CMD x.py2.7 RUN "build_stsci_python x 2.7" + CMD x.py2.7.1 RUN "build_stsci_python x 2.7.1" AFTER init/* AFTER *:assemble/x.stsci_python CMD x.hstcal RUN "build_hstcal x" diff --git a/sm/dist_dev.sm b/sm/dist_dev.sm index 7c07c02..3174288 100644 --- a/sm/dist_dev.sm +++ b/sm/dist_dev.sm @@ -21,19 +21,6 @@ TABLE distribute HOST bond cadeau banana # wads of special cases -# jwcalibdev has local disk - some day it may do its own builds -TABLE distribute HOST arzach - CMD jwcalibdev.iraf RUN "synctool jwcalibdev: irafdev" - AFTER stamp/dev - CMD jwcalibdev.pyssg RUN "synctool jwcalibdev: pyssgdev" - AFTER stamp/dev - CMD jwcalibdev.stsci_iraf RUN "synctool jwcalibdev: stsci_iraf_dev" - AFTER stamp/dev - CMD jwcalibdev.hstcal RUN "synctool jwcalibdev: hstcaldev" - AFTER stamp/dev - CMD jwcalibdev.motd RUN "synctool jwcalibdev: irafdev/iraf/unix/hlib/motd" - AFTER jwcalibdev.iraf - # goods - has RHE 5 only now TABLE distribute_other HOST arzach diff --git a/sm/test_dev.sm b/sm/test_dev.sm index ad1c199..4dee500 100644 --- a/sm/test_dev.sm +++ b/sm/test_dev.sm @@ -7,7 +7,7 @@ IMPORT "test_common.sm" # This structure is meant to serialize the regtests so that nothing else # is going on at the same time. The regtests can consume all the CPUs. TABLE test_run_dev HOST herbert thor arzach bond cadeau banana - CMD test2.7 RUN "test_rt dev 2.7" + CMD test2.7.1 RUN "test_rt dev 2.7.1" AFTER stamp/dev AFTER test_setup/okify AFTER test_setup/* @@ -15,12 +15,12 @@ TABLE test_run_dev HOST herbert thor arzach bond cadeau banana TABLE test_run_dev HOST arzach CMD test2.6 RUN "test_rt dev 2.6" AFTER stamp/dev - AFTER test2.7 + AFTER test2.7.1 TABLE test_run_dev HOST thor CMD contact RUN "test_contact" AFTER stamp/dev - AFTER test2.7 + AFTER test2.7.1 TABLE test_run_dev HOST jwcalibdev CMD jwst RUN "/data1/jwst_rt/rt" diff --git a/sm/test_x.sm b/sm/test_x.sm index f92e103..bf059d4 100644 --- a/sm/test_x.sm +++ b/sm/test_x.sm @@ -5,7 +5,7 @@ IMPORT "test_common.sm" # This structure is meant to serialize the regtests so that nothing else # is going on at the same time. The regtests can consume all the CPUs. TABLE test_run_x HOST arzach cadeau banana - CMD test2.7 RUN "test_rt x 2.7" + CMD test2.7.1 RUN "test_rt x 2.7.1" AFTER stamp/x AFTER test_setup/okify AFTER test_setup/* @@ -14,7 +14,7 @@ TABLE test_run_x HOST arzach cadeau banana TABLE test_run_x HOST arzach CMD contact RUN "test_contact" AFTER stamp/x - AFTER test2.7 + AFTER test2.7.1 TABLE test_import HOST ssb CMD x.import RUN "test_import irafx" |