From e6e7566f88a1af46322a9727c81b67a7ed14ed33 Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 18 Apr 2012 21:41:43 -0400
Subject: [PATCH] made run targets work a bit better, which will hopefully fix
 attack of stupidity the build server is having when running the crypto tests,
 occasionally.

---
 doc/headers/fmc_header.java   |  3 ++-
 doc/headers/shell_header.txt  |  3 ++-
 doc/headers/uva_header.java   |  3 ++-
 scripts/clam/rules.def        | 26 ++++-------------------
 scripts/clam/target_runner.sh | 39 +++++++++++++++++++++++++++++++++++
 5 files changed, 49 insertions(+), 25 deletions(-)
 create mode 100644 scripts/clam/target_runner.sh

diff --git a/doc/headers/fmc_header.java b/doc/headers/fmc_header.java
index 0c6a5f9a..bc60f6ad 100644
--- a/doc/headers/fmc_header.java
+++ b/doc/headers/fmc_header.java
@@ -1,6 +1,7 @@
 
 /**
- * {summary of class}
+ * {one-line description}
+ * {extended information...}
  * @author Chris Koeritz
  * @copyright Copyright (c) 2012-$now By Feisty Meow Concerns, Ltd.
  * @license This file is free software; you can modify/redistribute it under the terms of the GNU
diff --git a/doc/headers/shell_header.txt b/doc/headers/shell_header.txt
index daa9da99..1f2dd32e 100644
--- a/doc/headers/shell_header.txt
+++ b/doc/headers/shell_header.txt
@@ -10,4 +10,5 @@
 # of the GNU General Public License. [ http://www.gnu.org/licenses/gpl.html ]
 # Feel free to send updates to: [ fred@gruntose.com ]
 ##############
-
+#
+# ...description of file.
diff --git a/doc/headers/uva_header.java b/doc/headers/uva_header.java
index 8acd5073..55985ee9 100644
--- a/doc/headers/uva_header.java
+++ b/doc/headers/uva_header.java
@@ -1,6 +1,7 @@
 
 /**
- * {summary of class}
+ * {one-line description}
+ * {extended information...}
  * @author Chris Koeritz
  * @copyright Copyright (c) 2012-$now By University of Virginia
  * @license This file is free software; you can modify and redistribute it under the terms of the
diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index 1a526236..4706079f 100644
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -51,12 +51,12 @@ else \
   echo Skipping missing directory [$*]; \
 fi'
 
-# always run the targets.  if they don't exist, that's an error.
+# always run the exes listed in RUN_TARGETS.
 .PHONY: run_targets
 
 # "all" is the first target to execute in any makefile.  we capture it and
 # use it to produce the requested actions.
-all: start $(ACTUAL_FIRST_TARGETS) $(ACTUAL_TARGETS) $(ACTUAL_LAST_TARGETS) $(RUN_TARGETS:%=run_targets) finish 
+all: start $(ACTUAL_FIRST_TARGETS) $(ACTUAL_TARGETS) $(ACTUAL_LAST_TARGETS) run_targets finish 
 
 # "start" announces the beginning of compilation.
 start:
@@ -87,26 +87,8 @@ endif
 
 # runs the programs specified in the RUN_TARGETS variable.
 run_targets:
-	$(HIDESH) -c '\
-if [ ! -z "$(RUN_TARGETS)" ]; then \
-  if [ -f "$(DIRTY_FILE)" -o -f "$(SUBMAKE_FLAG)" ]; then \
-    total_exitval=0; \
-    for program_name in $(RUN_TARGETS); do \
-      base=`basename $$program_name`; \
-      "$$program_name"; \
-      exitval=$$?; \
-      if [ $$exitval -ne 0 ]; then \
-        echo -e "ERROR: $$program_name at `date`"; \
-        total_exitval=$$(($$total_exitval + 1)); \
-      fi; \
-    done; \
-    if [ $$total_exitval -ne 0 ]; then \
-      echo "FAILURE: errors occurred in RUN_TARGETS."; \
-      echo yep >"$(FAILURE_FILE)"; \
-      exit 1; \
-    fi; \
-  fi; \
-fi'
+	$(HIDESH)"$(CLAM_DIR)/target_runner.sh"
+#### "$(RUN_TARGETS)"
 
 # "make_subdirs" travels down each subdirectory and builds using make.
 make_subdirs:
diff --git a/scripts/clam/target_runner.sh b/scripts/clam/target_runner.sh
new file mode 100644
index 00000000..d915a9aa
--- /dev/null
+++ b/scripts/clam/target_runner.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+##############
+# Name   : target_runner.sh
+# Author : Chris Koeritz
+# Rights : Copyright (C) 2012-$now by Feisty Meow Concerns, Ltd.
+##############
+# This script is free software; you can modify/redistribute it under the terms
+# of the GNU General Public License. [ http://www.gnu.org/licenses/gpl.html ]
+# Feel free to send updates to: [ fred@gruntose.com ]
+##############
+#
+# Runs the programs listed in clam's RUN_TARGETS and reports any errors seen.
+
+#echo entering target_runner with variables:
+#echo -e "\tRUN_TARGETS=${RUN_TARGETS}"
+#echo -e "\tDIRTY_FILE=${DIRTY_FILE}"
+#echo -e "\tSUBMAKE_FLAG=${SUBMAKE_FLAG}"
+#echo -e "\tFAILURE_FILE=${FAILURE_FILE}"
+
+if [ ! -z "${RUN_TARGETS}" ]; then
+  if [ -f "${DIRTY_FILE}" -o -f "${SUBMAKE_FLAG}" ]; then
+    total_exitval=0;
+    for program_name in ${RUN_TARGETS}; do
+      base=$(basename $program_name);
+      "$program_name";
+      exitval=$?;
+      if [ $exitval -ne 0 ]; then
+        echo "ERROR: $program_name exits with $exitval at $(date)";
+        total_exitval=$(($total_exitval + 1));
+      fi;
+    done;
+    if [ $total_exitval -ne 0 ]; then
+      echo "FAILURE: $total_exitval errors occurred in RUN_TARGETS.";
+      echo yep >"${FAILURE_FILE}";
+      exit 1;
+    fi;
+  fi;
+fi
+
-- 
2.34.1