checkpoint; more changes related to new ssbdev/ssbx scheme

git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1131 d34015c8-bcbb-4646-8ac8-8ba5febf221d

12 files changed, 52 insertions, 29 deletions

diff --git a/sm_new/A_cdbs.sm b/sm_new/A_cdbs.sm
deleted file mode 100644
index f7b3c11..0000000
--- a/sm_new/A_cdbs.sm
+++ /dev/null
@@ -1,2 +0,0 @@
-IMPORT "init.sm"
-IMPORT "cdbs.sm"
diff --git a/sm_new/A_dev.sm b/sm_new/A_dev.sm
deleted file mode 100644
index 8ada106..0000000
--- a/sm_new/A_dev.sm
+++ /dev/null
@@ -1,3 +0,0 @@
-IMPORT "B_dev.sm"
-IMPORT "test_dev.sm"
-
diff --git a/sm_new/A_xb.sm b/sm_new/A_xb.sm
deleted file mode 100644
index d1195fe..0000000
--- a/sm_new/A_xb.sm
+++ /dev/null
@@ -1,11 +0,0 @@
-IMPORT "init.sm"
-IMPORT "assemble_common.sm"
-IMPORT "assemble_x.sm"
-IMPORT "build_x.sm"
-
-IMPORT "test_x.sm"
-
-TABLE assemble HOST arzach
-        CMD irafx_update RUN "/eng/ssb/auto/prog/irafx_update "
-                AFTER init/*
-
diff --git a/sm_new/A_xd.sm b/sm_new/A_xd.sm
deleted file mode 100644
index 5c27566..0000000
--- a/sm_new/A_xd.sm
+++ /dev/null
@@ -1,3 +0,0 @@
-IMPORT "init.sm"
-IMPORT "dist_x.sm"
-
diff --git a/sm_new/assemble_dev.sm b/sm_new/assemble_dev.sm
index 089a834..850f9f0 100644
--- a/sm_new/assemble_dev.sm
+++ b/sm_new/assemble_dev.sm
@@ -1,24 +1,30 @@
 # arzach assembles all the source code
 TABLE assemble HOST arzach
 
+    IF ssbdev_build:
 	CMD dev.stsci_python RUN "assemble_stsci_python dev"
 		AFTER svnsync
 
+    IF ssbdev_build:
 	CMD dev.stsci_iraf RUN "assemble_stsci_iraf dev"
 		AFTER svnsync
 
+    IF ssbdev_build:
 	CMD dev.axe RUN "assemble_axe dev"
 		AFTER svnsync
 
+    IF ssbdev_build:
 	CMD dev.hstcal RUN "assemble_hstcal dev"
 		AFTER svnsync
 
 
 TABLE assemble HOST jwcalibdev
 
+    IF ssbdev_build:
 	CMD dev.jwst RUN "assemble_jwst dev"
 		AFTER *:assemble/svnsync
 
+#   IF ssbdev_build:
 # 	CMD dev.crds RUN "assemble_crds dev"
 # 		AFTER *:assemble/svnsync
 
diff --git a/sm_new/assemble_x.sm b/sm_new/assemble_x.sm
index a29f4fa..8a4cc48 100644
--- a/sm_new/assemble_x.sm
+++ b/sm_new/assemble_x.sm
@@ -1,28 +1,34 @@
 # arzach assembles all the source code
 TABLE assemble HOST arzach
 
-	CMD x.stsci_python RUN "assemble_stsci_python x"
+    IF ssbx_build:
+	CMD x.irafx_age RUN "irafx_age.py"
 		AFTER init/*
+
+    IF ssbx_build:
+    CMD irafx_update RUN "/eng/ssb/auto/prog/irafx_update "
+        AFTER init/*
+
+    IF ssbx_build:
+	CMD x.stsci_python RUN "assemble_stsci_python x"
 		AFTER svnsync
 
+    IF ssbx_build:
 	CMD x.stsci_iraf RUN "assemble_stsci_iraf x"
-		AFTER init/*
 		AFTER svnsync
 
+    IF ssbx_build:
 	CMD x.axe RUN "assemble_axe x"
-		AFTER init/*
 		AFTER svnsync
 
+    IF ssbx_build:
 	CMD x.hstcal RUN "assemble_hstcal x"
-		AFTER init/*
 		AFTER svnsync
 
-	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
+    IF ssbx_build:
+    CMD x.jwst RUN "assemble_jwst x"
+        AFTER *:assemble/svnsync
 
diff --git a/sm_new/nightly.sm b/sm_new/nightly.sm
new file mode 100644
index 0000000..0ab4b4b
--- /dev/null
+++ b/sm_new/nightly.sm
@@ -0,0 +1,7 @@
+IMPORT "init.sm"
+
+IMPORT "test_dev.sm"
+IMPORT "test_x.sm"
+
+IMPORT "dist_dev.sm"
+IMPORT "dist_x.sm"
diff --git a/sm_new/nightly_conditions.sm b/sm_new/nightly_conditions.sm
new file mode 100644
index 0000000..4b9a2de
--- /dev/null
+++ b/sm_new/nightly_conditions.sm
@@ -0,0 +1,7 @@
+CONDITIONS
+	ssbdev_build = False
+	ssbdev_dist = False
+
+	ssbx_build = False
+	ssbx_dist = False
+END
diff --git a/sm_new/nightly_setup.sm b/sm_new/nightly_setup.sm
index 36854c3..3f6ce5b 100644
--- a/sm_new/nightly_setup.sm
+++ b/sm_new/nightly_setup.sm
@@ -3,4 +3,4 @@ IMPORT "cdbs.sm"
 IMPORT "pdk_ok.sm"
 IMPORT "assemble_common.sm"
 IMPORT "assemble_dev.sm"
-
+IMPORT "assemble_x.sm"
diff --git a/sm_new/test_dev.sm b/sm_new/test_dev.sm
index 312b6b6..b421d14 100644
--- a/sm_new/test_dev.sm
+++ b/sm_new/test_dev.sm
@@ -1,3 +1,9 @@
+# TODO
+# - install Ureka dev on test machines
+
+
+
+
 # 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 cadeau banana # herbert
diff --git a/sm_new/test_x.sm b/sm_new/test_x.sm
index ca324f3..b1f66b4 100644
--- a/sm_new/test_x.sm
+++ b/sm_new/test_x.sm
@@ -1,3 +1,7 @@
+# TODO
+# - install Ureka x on test machines
+
+
 # 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 herbert
diff --git a/steuermann/hosts.ini b/steuermann/hosts.ini
index 8c42254..cb0dcfe 100644
--- a/steuermann/hosts.ini
+++ b/steuermann/hosts.ini
@@ -61,6 +61,12 @@ like=cadeau
 
 ; actual machines
 
+[nott]
+hostname=nott
+like=linux:csh
+workdir=/srv/work
+maxproc=32
+
 [jwcalibdev]
 hostname=jwcalibdev
 like=linux:csh