aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsienkiew <sienkiew@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2012-09-10 17:16:32 -0400
committersienkiew <sienkiew@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2012-09-10 17:16:32 -0400
commit192e07eaa2814d98cb42e38a7bcf9e505d806fcf (patch)
tree60ad10945f5e61ad7d0bd92ea57c7a0de4c225d8
parent347d9aa3e4b666f9c6b2c81a6ee4d1e5d090018b (diff)
downloadsteuermann-192e07eaa2814d98cb42e38a7bcf9e505d806fcf.tar.gz
removing herbert, thor, bond from most things
git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@796 d34015c8-bcbb-4646-8ac8-8ba5febf221d
-rw-r--r--sm/build_dev.sm6
-rw-r--r--sm/build_x.sm4
-rw-r--r--sm/cdbs.sm4
-rw-r--r--sm/dist_dev.sm6
-rw-r--r--sm/dist_x.sm10
-rw-r--r--sm/test_common.sm2
-rw-r--r--sm/test_dev.sm2
7 files changed, 17 insertions, 17 deletions
diff --git a/sm/build_dev.sm b/sm/build_dev.sm
index 12aefa6..f46e61f 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 arzach bond cadeau banana jwcalibdev
+TABLE build HOST arzach cadeau banana jwcalibdev
CMD dev.py2.7.3 RUN "build_stsci_python dev 2.7.3"
AFTER init/*
AFTER *:assemble/dev.stsci_python
@@ -56,7 +56,7 @@ TABLE build HOST herbert bond
# stsdas for 64 bit machines - get it from a related 32 bit system
-TABLE build HOST thor arzach jwcalibdev
+TABLE build HOST arzach jwcalibdev
CMD dev.stsci_iraf_64hack RUN "build_stsci_iraf_64hack dev herbert"
AFTER herbert:build/dev.stsci_iraf*
@@ -77,7 +77,7 @@ TABLE build HOST thor
AFTER build/dev.py2.7.*
# stamp the IRAF banner file when the builds are complete
-TABLE stamp HOST herbert thor arzach bond cadeau banana jwcalibdev
+TABLE stamp HOST herbert arzach bond cadeau banana jwcalibdev
CMD dev RUN "build_stamp dev"
AFTER build/*
diff --git a/sm/build_x.sm b/sm/build_x.sm
index ca6addc..5ba8e03 100644
--- a/sm/build_x.sm
+++ b/sm/build_x.sm
@@ -7,7 +7,7 @@
# install stsci_python into default environment
# build hstcal
# - everywhere
-TABLE build HOST arzach bond cadeau banana
+TABLE build HOST arzach cadeau banana
CMD x.py2.7.3 RUN "build_stsci_python x 2.7.3"
AFTER init/*
AFTER *:assemble/x.stsci_python
@@ -47,7 +47,7 @@ TABLE build HOST cadeau banana
# stamp the IRAF banner file when the builds are complete
-TABLE stamp HOST herbert thor arzach bond cadeau banana
+TABLE stamp HOST herbert arzach bond cadeau banana
CMD x RUN "build_stamp x"
AFTER build/*
diff --git a/sm/cdbs.sm b/sm/cdbs.sm
index 178ae0b..a4f5dcf 100644
--- a/sm/cdbs.sm
+++ b/sm/cdbs.sm
@@ -1,8 +1,8 @@
-TABLE cdbs HOST bond cadeau banana
+TABLE cdbs HOST cadeau banana
CMD local_copy RUN "cdbs_copy"
AFTER init/*
-TABLE cdbs HOST bond
+TABLE cdbs HOST cadeau
CMD mac_package RUN "/Users/iraf/daily_build/mac_package/make_packages cdbs"
AFTER cdbs/local_copy
diff --git a/sm/dist_dev.sm b/sm/dist_dev.sm
index 3174288..8c33455 100644
--- a/sm/dist_dev.sm
+++ b/sm/dist_dev.sm
@@ -3,7 +3,7 @@
# regular distributions
-TABLE distribute HOST herbert thor arzach
+TABLE distribute HOST arzach
CMD dev.iraf RUN "synctool - irafdev"
AFTER stamp/dev
CMD dev.pyssg RUN "synctool - pyssgdev"
@@ -15,7 +15,7 @@ TABLE distribute HOST herbert thor arzach
CMD dev.motd RUN "synctool - irafdev/iraf/unix/hlib/motd"
AFTER distribute/dev.iraf
-TABLE distribute HOST bond cadeau banana
+TABLE distribute HOST cadeau banana
CMD irafdev.pkg RUN "cd $HOME/daily_build/mac_package; ./build dev " AFTER stamp/dev
CMD irafdev.dmg RUN "cd $HOME/daily_build/mac_package; ./distribute dev -" AFTER irafdev.pkg
@@ -65,7 +65,7 @@ TABLE distribute_other HOST arzach
# royal - a beowulf cluster
-TABLE distribute_other HOST thor
+TABLE distribute_other HOST arzach
CMD royal.iraf RUN "synctool royal: irafdev"
AFTER stamp/dev
CMD royal.pyssg RUN "synctool royal: pyssgdev"
diff --git a/sm/dist_x.sm b/sm/dist_x.sm
index 2585a1f..ed81c9d 100644
--- a/sm/dist_x.sm
+++ b/sm/dist_x.sm
@@ -8,7 +8,7 @@ TABLE x_distribute HOST herbert thor arzach bond cadeau banana
# regular distributions
-TABLE x_distribute HOST herbert thor arzach
+TABLE x_distribute HOST thor arzach
CMD x.iraf RUN "synctool - irafx"
AFTER x_distribute/gate
CMD x.pyssg RUN "synctool - pyssgx"
@@ -22,7 +22,7 @@ TABLE x_distribute HOST herbert thor arzach
#
-TABLE x_distribute HOST bond cadeau banana
+TABLE x_distribute HOST cadeau banana
CMD irafx.pkg RUN "cd $HOME/daily_build/mac_package; ./build x "
AFTER x_distribute/gate
CMD irafx.dmg RUN "cd $HOME/daily_build/mac_package; ./distribute x -"
@@ -45,7 +45,7 @@ TABLE x_distribute HOST arzach
# web distribution
-TABLE x_distribute HOST bond
+TABLE x_distribute HOST cadeau
CMD x.web RUN "do_irafx_web"
AFTER x_distribute/gate
AFTER *:x_distribute/irafx.pkg
@@ -54,7 +54,7 @@ TABLE x_distribute HOST bond
TABLE x_distribute HOST herbert
CMD x.web RUN "do_irafx_web S"
AFTER x_distribute/gate
- AFTER bond:x_distribute/x.web
+ AFTER cadeau:x_distribute/x.web
AFTER *:x_distribute/irafx.pkg
AFTER *:x_distribute/irafx.dmg
@@ -103,7 +103,7 @@ TABLE x_distribute_other HOST arzach
# royal - a beowulf cluster
-TABLE x_distribute_other HOST thor
+TABLE x_distribute_other HOST arzach
CMD royal.iraf RUN "synctool royal: irafx"
AFTER x_distribute/gate
CMD royal.pyssg RUN "synctool royal: pyssgx"
diff --git a/sm/test_common.sm b/sm/test_common.sm
index 251720e..78e5ef2 100644
--- a/sm/test_common.sm
+++ b/sm/test_common.sm
@@ -1,4 +1,4 @@
-TABLE test_setup HOST herbert thor arzach bond cadeau banana
+TABLE test_setup HOST arzach cadeau banana
CMD okify RUN "test_okify"
AFTER init/*
diff --git a/sm/test_dev.sm b/sm/test_dev.sm
index 72ea3f4..6609297 100644
--- a/sm/test_dev.sm
+++ b/sm/test_dev.sm
@@ -6,7 +6,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 arzach bond cadeau banana
+TABLE test_run_dev HOST arzach cadeau banana
CMD test2.7.3 RUN "test_rt dev 2.7.3"
AFTER stamp/dev
AFTER test_setup/okify