From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Wed, 20 Jun 2012 21:39:39 +0000 (+0100)
Subject: Work around non-portable shell built-in echo.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=2d6e2f7c3cb9f124db6361a619f87e762deaba22;p=francis%2Fexcafe_benchmarks.git

Work around non-portable shell built-in echo.
---

diff --git a/mass_matrix_2d/generate_ufl_rules.sh b/mass_matrix_2d/generate_ufl_rules.sh
index 93940e1..c219d03 100755
--- a/mass_matrix_2d/generate_ufl_rules.sh
+++ b/mass_matrix_2d/generate_ufl_rules.sh
@@ -3,6 +3,7 @@
 PROGRAMS=""
 CLEAN_FILES=""
 INTERMEDIATES=""
+ECHO="/bin/echo"
 
 for NF in 1 2 3 4; do
   for P in 1 2 3; do
@@ -22,8 +23,8 @@ for NF in 1 2 3 4; do
 
       TEMPLATE_GENERATED="${UFL_FILE} ${BENCHMARK_SOURCE}"
 
-      echo "${UFL_FILE}: ${TEMPLATE_FILE}"
-      echo -e "\tm4 -DP_VALUE=${P} -DQ_VALUE=${Q} \$^ > \$@"
+      ${ECHO} "${UFL_FILE}: ${TEMPLATE_FILE}"
+      ${ECHO} -e "\tm4 -DP_VALUE=${P} -DQ_VALUE=${Q} \$^ > \$@"
 
       FFC_BUILT_SOURCES=""
       for REPRESENTATION in tensor quadrature; do
@@ -33,36 +34,36 @@ for NF in 1 2 3 4; do
         INTERMEDIATES="${INTERMEDIATES} ${REP_SPECIFIC_UFL_FILE}"
 
         # We need two copies, one for quadrature, one for tensor.
-        echo "${REP_SPECIFIC_UFL_FILE}: ${UFL_FILE}"
-        echo -e "\tcp \$^ \$@"
+        ${ECHO} "${REP_SPECIFIC_UFL_FILE}: ${UFL_FILE}"
+        ${ECHO} -e "\tcp \$^ \$@"
 
         FFC_HEADER="mass_matrix_${REP_SPECIFIC_OPTIONS}.h"
         FFC_BUILT_SOURCES="${FFC_HEADER} ${FFC_BUILT_SOURCES}"
 
-        echo "${FFC_HEADER}: ${REP_SPECIFIC_UFL_FILE}"
-        echo -e "\tffc --optimize -r ${REPRESENTATION} --language ufc \$^" 
+        ${ECHO} "${FFC_HEADER}: ${REP_SPECIFIC_UFL_FILE}"
+        ${ECHO} -e "\tffc --optimize -r ${REPRESENTATION} --language ufc \$^" 
       done
 
       # Generate Excafe headers
       EXCAFE_HEADER="mass_matrix_${OPTIONS}_excafe.h"
       EXCAFE_BUILT_SOURCES="${EXCAFE_HEADER}"
-      echo "${EXCAFE_HEADER}:"
-      echo -e "\t\${MASS_MATRIX_2D_GENERATOR} ${NF} ${P} ${Q} ${EXCAFE_HEADER}"
+      ${ECHO} "${EXCAFE_HEADER}:"
+      ${ECHO} -e "\t\${MASS_MATRIX_2D_GENERATOR} ${NF} ${P} ${Q} ${EXCAFE_HEADER}"
 
       # Generate dependencies for benchmark executable
-      echo "${BENCHMARK_SOURCE}: ${BENCHMARK_TEMPLATE}"
-      echo -e "\tm4 -DNF_VALUE=${NF} -DP_VALUE=${P} -DQ_VALUE=${Q} \$^ > \$@"
-      echo "${BENCHMARK_EXECUTABLE}: ${BENCHMARK_SOURCE} ${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES}"
-      echo -e '\t${CXX} ${CXXFLAGS} ${LDFLAGS} $< -o $@'
+      ${ECHO} "${BENCHMARK_SOURCE}: ${BENCHMARK_TEMPLATE}"
+      ${ECHO} -e "\tm4 -DNF_VALUE=${NF} -DP_VALUE=${P} -DQ_VALUE=${Q} \$^ > \$@"
+      ${ECHO} "${BENCHMARK_EXECUTABLE}: ${BENCHMARK_SOURCE} ${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES}"
+      ${ECHO} -e '\t${CXX} ${CXXFLAGS} ${LDFLAGS} $< -o $@'
 
       CLEAN_FILES="${BENCHMARK_EXECUTABLE} ${TEMPLATE_GENERATED} ${CLEAN_FILES}"
       CLEAN_FILES="${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES} ${CLEAN_FILES}"
 
-      echo
+      ${ECHO}
     done
   done
 done
 
-echo "ALL_EXECUTABLES = ${PROGRAMS}"
-echo "CLEAN_FILES=${CLEAN_FILES}"
-echo "INTERMEDIATES=${INTERMEDIATES}"
+${ECHO} "ALL_EXECUTABLES = ${PROGRAMS}"
+${ECHO} "CLEAN_FILES=${CLEAN_FILES}"
+${ECHO} "INTERMEDIATES=${INTERMEDIATES}"