commit 8777b5e3ba373ad5242a1d867e6aacc0387bf83b
author Philip Tricca <philip.b.tricca@intel.com> Wed Sep 16 13:14:46 2015 -0700
committer Philip Tricca <philip.b.tricca@intel.com> Wed Sep 16 17:18:13 2015 -0700
tree 6ece01874233f87ec0bbd4ca5e86019ae8588f50
parent c570ec22559d1331aab5ebf4e0272d7257f18008

bootstrap: Fixup bourne shell compatibility & cleanup.

Fix spacing in shebang.
Bourne shell 'echo' doesn't understand -e, replace with printf.
Function definition with 'function' is bash specific.
Capture all output to src_vars.mk in a single redirect.
Print output for autotools utilities and set -e to halt on errors.

Signed-off-by: Philip Tricca <philip.b.tricca@intel.com>

bootstrap

diff --git a/bootstrap b/bootstrap
index 257956d..bf99a24 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,9 @@
-#! /bin/sh
+#!/bin/sh
+set -e
 
 # generate list of source files for use in Makefile.am
 # if you add new source files, you must run ./bootstrap again
-function src_listvar () {
+src_listvar () {
     basedir=$1
     suffix=$2
     var=$3
@@ -14,30 +15,34 @@
 VARS_FILE=src_vars.mk
 
 echo "Generating file lists: ${VARS_FILE}"
-if [ -e ${VARS_FILE} ]; then rm ${VARS_FILE}; fi
+(
+  src_listvar "sysapi/include" "*.h" "SYSAPI_H"
+  src_listvar "sysapi/sysapi" "*.c" "SYSAPI_C"
+  src_listvar "sysapi/sysapi_util" "*.c" "SYSAPIUTIL_C"
+  printf "SYSAPI_SRC = \$(SYSAPI_H) \$(SYSAPI_C) \$(SYSAPIUTIL_C)\n"
 
-src_listvar "sysapi/include" "*.h" "SYSAPI_H" >> ${VARS_FILE}
-src_listvar "sysapi/sysapi" "*.c" "SYSAPI_C" >> ${VARS_FILE}
-src_listvar "sysapi/sysapi_util" "*.c" "SYSAPIUTIL_C" >> ${VARS_FILE}
-echo -e "SYSAPI_SRC = \$(SYSAPI_H) \$(SYSAPI_C) \$(SYSAPIUTIL_C)\n" >> ${VARS_FILE}
+  src_listvar "common" "*.c" "COMMON_C"
+  src_listvar "common" "*.h" "COMMON_H"
+  printf "COMMON_SRC = \$(COMMON_C) \$(COMMON_H)\n"
 
-src_listvar "common" "*.c" "COMMON_C" >> ${VARS_FILE}
-src_listvar "common" "*.h" "COMMON_H" >> ${VARS_FILE}
-echo -e "COMMON_SRC = \$(COMMON_C) \$(COMMON_H)\n" >> ${VARS_FILE}
+  src_listvar "tcti/localtpm" "*.c" "LOCALTPM_C"
+  src_listvar "tcti/localtpm" "*.h" "LOCALTPM_H"
+  printf "LOCALTPM_SRC = \$(LOCALTPM_C) \$(LOCALTPM_H)\n"
 
-src_listvar "tcti/localtpm" "*.c" "LOCALTPM_C" >> ${VARS_FILE}
-src_listvar "tcti/localtpm" "*.h" "LOCALTPM_H" >> ${VARS_FILE}
-echo -e "LOCALTPM_SRC = \$(LOCALTPM_C) \$(LOCALTPM_H)\n" >> ${VARS_FILE}
+  src_listvar "test/common/sample" "*.c" "SAMPLE_C"
+  src_listvar "test/common/sample" "*.h" "SAMPLE_H"
+  printf "SAMPLE_SRC = \$(SAMPLE_C) \$(SAMPLE_H)\n"
 
-src_listvar "test/common/sample" "*.c" "SAMPLE_C" >> ${VARS_FILE}
-src_listvar "test/common/sample" "*.h" "SAMPLE_H" >> ${VARS_FILE}
-echo -e "SAMPLE_SRC = \$(SAMPLE_C) \$(SAMPLE_H)\n" >> ${VARS_FILE}
+  src_listvar "tcti/tpmsockets" "*.cpp" "TPMSOCKETS_C"
+  src_listvar "tcti/tpmsockets" "*.h" "TPMSOCKETS_H"
+  printf "TPMSOCKETS_SRC = \$(TPMSOCKETS_C) \$(TPMSOCKETS_H)\n"
+) > ${VARS_FILE}
 
-src_listvar "tcti/tpmsockets" "*.cpp" "TPMSOCKETS_C" >> ${VARS_FILE}
-src_listvar "tcti/tpmsockets" "*.h" "TPMSOCKETS_H" >> ${VARS_FILE}
-echo -e "TPMSOCKETS_SRC = \$(TPMSOCKETS_C) \$(TPMSOCKETS_H)\n" >> ${VARS_FILE}
-
-libtoolize --install \
-&& aclocal \
-&& autoconf \
-&& automake --add-missing
+printf "Running libtoolize ...\n"
+libtoolize --install
+printf "Running aclocal ...\n"
+aclocal
+printf "Running autoconf ...\n"
+autoconf
+printf "Running automake ...\n"
+automake --add-missing