From 702960cb7b8a06c61988d817098d298e5fa78349 Mon Sep 17 00:00:00 2001 From: cslocum Date: Thu, 18 Sep 2014 14:06:42 +0000 Subject: take out reduntant init steps from testing SM files git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1323 d34015c8-bcbb-4646-8ac8-8ba5febf221d --- sm/A_astrolib.sm | 5 ----- sm/assemble_astrolib.sm | 5 ----- sm/build_astrolib.sm | 5 ----- sm/dist_dev.sm | 2 -- sm/dist_x.sm | 8 -------- sm/nightly.sm | 2 -- sm/old/A_astrolib.sm | 5 +++++ sm/old/README | 2 ++ sm/old/assemble_astrolib.sm | 5 +++++ sm/old/build_astrolib.sm | 5 +++++ sm/test_dev.sm | 1 - sm/test_x.sm | 1 - 12 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 sm/A_astrolib.sm delete mode 100644 sm/assemble_astrolib.sm delete mode 100644 sm/build_astrolib.sm create mode 100644 sm/old/A_astrolib.sm create mode 100644 sm/old/README create mode 100644 sm/old/assemble_astrolib.sm create mode 100644 sm/old/build_astrolib.sm diff --git a/sm/A_astrolib.sm b/sm/A_astrolib.sm deleted file mode 100644 index 9da7ffc..0000000 --- a/sm/A_astrolib.sm +++ /dev/null @@ -1,5 +0,0 @@ -IMPORT "init.sm" -IMPORT "assemble_common.sm" -IMPORT "assemble_astrolib.sm" -IMPORT "build_astrolib.sm" - diff --git a/sm/assemble_astrolib.sm b/sm/assemble_astrolib.sm deleted file mode 100644 index 0ee7417..0000000 --- a/sm/assemble_astrolib.sm +++ /dev/null @@ -1,5 +0,0 @@ -TABLE assemble HOST arzach - - CMD dev.astrolib RUN "assemble_astrolib" - AFTER init/* - diff --git a/sm/build_astrolib.sm b/sm/build_astrolib.sm deleted file mode 100644 index fdeb5de..0000000 --- a/sm/build_astrolib.sm +++ /dev/null @@ -1,5 +0,0 @@ - -TABLE build HOST arzach - CMD dev.astrolib RUN "build_astrolib" - AFTER arzach:assemble/dev.astrolib - diff --git a/sm/dist_dev.sm b/sm/dist_dev.sm index 33eb310..0dff1fe 100644 --- a/sm/dist_dev.sm +++ b/sm/dist_dev.sm @@ -3,14 +3,12 @@ TABLE build_docs HOST cadeau IF ssbdev_dist: CMD stsci_python_dev_docs RUN "build_sphinxdocs dev" - AFTER init/* AFTER OPT test_dev/install_dev TABLE build_docs HOST jwcalibdev IF ssbdev_dist: CMD jwst_dev_docs RUN "build_jwst_docs dev" - AFTER init/* AFTER OPT test_dev/install_dev diff --git a/sm/dist_x.sm b/sm/dist_x.sm index 05b4782..9781c09 100644 --- a/sm/dist_x.sm +++ b/sm/dist_x.sm @@ -3,20 +3,17 @@ TABLE build_docs HOST cadeau IF ssbx_dist: CMD stsci_python_x_docs RUN "build_sphinxdocs x" - AFTER init/* TABLE build_docs HOST jwcalibdev IF ssbx_dist: CMD jwst_x_docs RUN "build_jwst_docs x" - AFTER init/* TABLE distribute HOST nott IF ssbx_dist: CMD sync_ssbx RUN "synctool - ssbx" - AFTER init/* TABLE distribute HOST ssb @@ -24,9 +21,4 @@ TABLE distribute HOST ssb # to /eng/ssb/websites/ssbpublic/ureka/x IF ssbx_dist: CMD push_ssbx_to_web RUN "push_ssbx_to_web" - AFTER init/* - - - - diff --git a/sm/nightly.sm b/sm/nightly.sm index 0ab4b4b..72ba01b 100644 --- a/sm/nightly.sm +++ b/sm/nightly.sm @@ -1,5 +1,3 @@ -IMPORT "init.sm" - IMPORT "test_dev.sm" IMPORT "test_x.sm" diff --git a/sm/old/A_astrolib.sm b/sm/old/A_astrolib.sm new file mode 100644 index 0000000..9da7ffc --- /dev/null +++ b/sm/old/A_astrolib.sm @@ -0,0 +1,5 @@ +IMPORT "init.sm" +IMPORT "assemble_common.sm" +IMPORT "assemble_astrolib.sm" +IMPORT "build_astrolib.sm" + diff --git a/sm/old/README b/sm/old/README new file mode 100644 index 0000000..f53e2da --- /dev/null +++ b/sm/old/README @@ -0,0 +1,2 @@ +I think the files in here are unused, and they can probably be deleted, but I'm +not sure so I'm sticking them here for easy recovery if things break :) diff --git a/sm/old/assemble_astrolib.sm b/sm/old/assemble_astrolib.sm new file mode 100644 index 0000000..0ee7417 --- /dev/null +++ b/sm/old/assemble_astrolib.sm @@ -0,0 +1,5 @@ +TABLE assemble HOST arzach + + CMD dev.astrolib RUN "assemble_astrolib" + AFTER init/* + diff --git a/sm/old/build_astrolib.sm b/sm/old/build_astrolib.sm new file mode 100644 index 0000000..fdeb5de --- /dev/null +++ b/sm/old/build_astrolib.sm @@ -0,0 +1,5 @@ + +TABLE build HOST arzach + CMD dev.astrolib RUN "build_astrolib" + AFTER arzach:assemble/dev.astrolib + diff --git a/sm/test_dev.sm b/sm/test_dev.sm index d49bde7..3d0df21 100644 --- a/sm/test_dev.sm +++ b/sm/test_dev.sm @@ -3,7 +3,6 @@ TABLE test_dev HOST arzach banana cadeau nott jwcalibdev IF ssbdev_test: CMD install_dev RUN "install_ssb_ureka dev" - AFTER init/* TABLE test_dev HOST cadeau diff --git a/sm/test_x.sm b/sm/test_x.sm index 43e9584..e41cb8e 100644 --- a/sm/test_x.sm +++ b/sm/test_x.sm @@ -3,7 +3,6 @@ TABLE test_x HOST arzach banana cadeau nott jwcalibdev IF ssbx_test: CMD install_x RUN "install_ssb_ureka x" - AFTER init/* AFTER OPT test_dev/* TABLE test_x HOST cadeau -- cgit