aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sm/assemble_dev.sm4
-rw-r--r--sm/build_dev.sm8
-rw-r--r--sm/dist_dev.sm13
3 files changed, 8 insertions, 17 deletions
diff --git a/sm/assemble_dev.sm b/sm/assemble_dev.sm
index d3eecab..0d32c8b 100644
--- a/sm/assemble_dev.sm
+++ b/sm/assemble_dev.sm
@@ -17,9 +17,11 @@ TABLE assemble HOST arzach
AFTER init/*
AFTER svnsync
+TABLE assemble HOST jwcalibdev
+
CMD dev.jwst RUN "assemble_jwst dev"
AFTER init/*
- AFTER svnsync
+ AFTER *:svnsync
# CMD dev.crds RUN "assemble_crds dev"
# AFTER init/*
diff --git a/sm/build_dev.sm b/sm/build_dev.sm
index a428caf..a8ba46e 100644
--- a/sm/build_dev.sm
+++ b/sm/build_dev.sm
@@ -7,7 +7,7 @@
# install stsci_python into default environment
# build hstcal
# - everywhere
-TABLE build HOST herbert thor arzach bond cadeau banana
+TABLE build HOST herbert thor arzach bond cadeau banana jwcalibdev
CMD dev.py2.7 RUN "build_stsci_python dev 2.7"
AFTER init/*
AFTER *:assemble/dev.stsci_python
@@ -53,7 +53,7 @@ TABLE build HOST herbert bond
# stsdas for 64 bit machines - get it from a related 32 bit system
-TABLE build HOST thor arzach
+TABLE build HOST thor arzach jwcalibdev
CMD dev.stsci_iraf_64hack RUN "build_stsci_iraf_64hack dev herbert"
AFTER herbert:build/dev.stsci_iraf*
@@ -79,7 +79,9 @@ TABLE stamp HOST herbert thor arzach bond cadeau banana
AFTER build/*
#
-TABLE build HOST jwcalibdev
+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
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