cleaning up build scripts in preparation for adding a clang build
diff --git a/aos/build/prime-build.sh b/aos/build/prime-build.sh
new file mode 100755
index 0000000..9ae3c3e
--- /dev/null
+++ b/aos/build/prime-build.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+#set -x
+# TODO(brians): This needs to be a python script that still deals with
+# stdout/stderr correctly but also has real argument parsing.
+# That should probably fold most of the other shell scripts in too...
+
+if [[ "$1" == "amd64" ]]; then
+ NO_TARGET=1
+ shift 1
+elif [[ "$1" == "arm" ]]; then
+ NO_AMD64=1
+ shift 1
+fi
+
+[[ "$1" == "tests" ]] && NO_TARGET=1
+[[ "$1" == "deploy" ]] && NO_AMD64=1
+
+OTHER_ARGS="$@"
+
+build_platform() {
+ PLATFORM=$1
+ OUT_NAME=$2
+ HUMAN_NAME=$3
+
+ echo "Building code for ${HUMAN_NAME}..." 1>&2
+ ../../aos/build/build.sh ${PLATFORM} prime.gyp no ${OUT_NAME} "${OTHER_ARGS}"
+ if [[ $? -ne 0 ]]; then
+ echo "Building code for ${HUMAN_NAME} failed!" 1>&2
+ exit 1
+ fi
+ echo "Building code for ${HUMAN_NAME} succeeded." 1>&2
+}
+
+if [[ ! ${NO_TARGET} ]]; then
+ build_platform linux prime target
+fi
+if [[ ! ${NO_AMD64} ]]; then
+ build_platform linux-amd64 prime-amd64 amd64
+fi
diff --git a/frc971/prime/build.sh b/frc971/prime/build.sh
index e3d02a2..71b6e32 100755
--- a/frc971/prime/build.sh
+++ b/frc971/prime/build.sh
@@ -2,32 +2,4 @@
cd $(dirname $0)
-if [[ "$1" == "amd64" ]]; then
- NO_TARGET=1
- shift 1
-elif [[ "$1" == "arm" ]]; then
- NO_AMD64=1
- shift 1
-fi
-
-[[ "$1" == "tests" ]] && NO_TARGET=1
-[[ "$1" == "deploy" ]] && NO_AMD64=1
-
-if [[ ! ${NO_TARGET} ]]; then
- echo 'Building code for target...' 1>&2
- ../../aos/build/build.sh linux prime.gyp no prime "$@"
- if [[ $? -ne 0 ]]; then
- echo 'Building code for target failed!' 1>&2
- exit 1
- fi
- echo 'Building code for target succeeded.' 1>&2
-fi
-if [[ ! ${NO_AMD64} ]]; then
- echo 'Building code for amd64...' 1>&2
- ../../aos/build/build.sh linux-amd64 prime.gyp yes prime-amd64 "$@"
- if [[ $? -ne 0 ]]; then
- echo 'Building code for amd64 failed!' 1>&2
- exit 1
- fi
- echo 'Building code for amd64 succeeded.' 1>&2
-fi
+../../aos/build/prime-build.sh "$@"