diff --git a/joeybuild.sh b/joeybuild.sh index 3c349c4..7d779ea 100755 --- a/joeybuild.sh +++ b/joeybuild.sh @@ -109,6 +109,7 @@ function doBuild() { local LOG= local PASS= local PROJECT_TYPE= + local PROJECT_JOEYLIB= pushd "${SOURCE}" @@ -125,11 +126,13 @@ function doBuild() { G_BUILD_PLATFORMS="[" G_BUILD_PROJECT= PROJECT_TYPE= + PROJECT_JOEYLIB= - # Sample project file: + # Sample build.start file: # - # application + # Application # Warehouse + # Latest (or name of custom JoeyLib) # IIgs 65816 # Linux i386 x86_64 # Windows i686 x86_64 @@ -172,7 +175,13 @@ function doBuild() { continue fi - # This is for the 3rd and later lines of the project that list which targets to build. + # If we don't have a JoeyLib to use, grab it from the third line. + if [[ -z ${PROJECT_JOEYLIB} ]]; then + PROJECT_JOEYLIB=${LINE} + #***TODO*** Deal with this. + fi + + # This is for the 4th and later lines of the project that list which targets to build. TARGET= for TEMP in ${LINE}; do if [[ -z ${TARGET} ]]; then @@ -548,4 +557,5 @@ function withTargets() { # At the very end so we can stream this script from a web server. +# shellcheck disable=SC2068 startup $@ 2>&1 | tee lastrun.log