From e8ba28c3061ba3ce2589a6a4676d5b82c842ce6e Mon Sep 17 00:00:00 2001 From: olsner Date: Sat, 8 Aug 2009 11:22:42 +0000 Subject: [PATCH] Automatically build bundled external libraries and report errors if premake or an external library fails to build This was SVN commit r7091. --- build/workspaces/update-workspaces.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh index 0a884670c5..336a8f50a1 100755 --- a/build/workspaces/update-workspaces.sh +++ b/build/workspaces/update-workspaces.sh @@ -1,12 +1,22 @@ #!/bin/sh +die() +{ + echo ERROR: $* + exit 1 +} + cd "$(dirname $0)" # Now in build/workspaces/ (where we assume this script resides) +# Build/update bundled external libraries +(cd ../../libraries/fcollada/src && make) || die "FCollada build failed" +(cd ../../libraries/spidermonkey/src && ./build.sh) || die "SpiderMonkey build failed" + # Make sure workspaces/gcc exists. mkdir -p gcc # Now build premake and run it to create the makefiles cd ../premake -make -C src -src/bin/premake --outpath ../workspaces/gcc --atlas --collada "$@" --target gnu +make -C src || die "Premake build failed" +src/bin/premake --outpath ../workspaces/gcc --atlas --collada "$@" --target gnu || die "Premake failed"