Merge pull request #929 from cailyoung/fix-test-build-script

Update "testing" build script so it works regardless of execution location

scripts/build_commandpost_testing.sh

@@ -1,20 +1,34 @@
 #!/bin/bash
-
+# failsafes
+set -eu
+set -o pipefail
 #
 # Compile CommandPost:
 #
 
-cd ../CommandPost-App/
+# set directory variables
+# export SCRIPT_NAME
+export SCRIPT_HOME
+export HAMMERSPOON_HOME
+
+# SCRIPT_NAME="$(basename "$0")"
+SCRIPT_HOME="$(dirname "$(greadlink -f "$0")")" # fully qualified directory of this script
+HAMMERSPOON_HOME="$(greadlink -f "${SCRIPT_HOME}/../../CommandPost-App")" # fully qualified directory of the CommandPost-App repository
 
-make clean
-make release
-make docs
+# Import our function library
+# shellcheck source=scripts/inc/librelease.sh disable=SC1091
+source "${SCRIPT_HOME}/inc/librelease.sh"
 
-rm -fr `xcodebuild -workspace Hammerspoon.xcworkspace -scheme Hammerspoon -configuration DEBUG -showBuildSettings | sort | uniq | grep " BUILT_PRODUCTS_DIR =" | awk '{ print $3 }'`/CommandPost.app
+build_hammerspoon_dev # run the build-dev function from librelease
+
+# clean up the unsigned build
+rm -fr "$(xcodebuild -workspace "${HAMMERSPOON_HOME}/Hammerspoon.xcworkspace" -scheme Hammerspoon -configuration Release -showBuildSettings | sort | uniq | grep " BUILT_PRODUCTS_DIR =" | awk '{ print $3 }')/CommandPost.app"
 
 #
 # Sign App with self-signed certificate:
 #
-codesign --verbose --sign "Internal Code Signing" "build/CommandPost.app/Contents/Frameworks/Sparkle.framework/Versions/A"
-codesign --verbose --sign "Internal Code Signing" "build/CommandPost.app/Contents/Frameworks/LuaSkin.framework/Versions/A"
-codesign --verbose --sign "Internal Code Signing" "build/CommandPost.app"
+codesign --verbose --sign "Internal Code Signing" "${HAMMERSPOON_HOME}/build/CommandPost.app/Contents/Frameworks/Sparkle.framework/Versions/A"
+codesign --verbose --sign "Internal Code Signing" "${HAMMERSPOON_HOME}/build/CommandPost.app/Contents/Frameworks/LuaSkin.framework/Versions/A"
+codesign --verbose --sign "Internal Code Signing" "${HAMMERSPOON_HOME}/build/CommandPost.app"
+
+echo "Dev build complete. Launch from ${HAMMERSPOON_HOME}/build/"

scripts/inc/librelease.sh

@@ -232,6 +232,20 @@ function build_hammerspoon_app() {
   fi
 }
 
+function build_hammerspoon_dev() {
+  echo "Building CommandPost.app for development..."
+  pushd "${HAMMERSPOON_HOME}" >/dev/null || return
+  make clean
+  make release
+  rm build/docs.json
+  # make docs
+  # make build/html/LuaSkin
+  popd >/dev/null || return
+  if [ ! -e "${HAMMERSPOON_HOME}"/build/CommandPost.app ]; then
+      fail "Looks like the build failed. sorry!"
+  fi
+}
+
 ############################ POST-BUILD FUNCTIONS #############################
 
 function build_dmgcanvas() {
@@ -432,4 +446,3 @@ function release_tweet() {
   t update "Just released ${VERSION} - http://www.hammerspoon.org/releasenotes/"
   t set active "$CURRENT"
 }
-