From 81df2f9c5fd55406baf0f53550c7aae1b60df2cf Mon Sep 17 00:00:00 2001 From: don bright Date: Fri, 3 Aug 2012 19:38:47 -0500 Subject: some tweaks for better error reporting diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index e69ed87..c0b1469 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -2,6 +2,7 @@ OpenSCAD Release Checklist -------------------------- o Update VERSION environment variable + export VERSION=2012.08 It will be used by the commands below, as well as these files: @@ -27,7 +28,8 @@ o build binaries Linux: FIXME 32 vs. 64 bit ./scripts/release-linux.sh Windows mingw cross-build: FIXME 32 vs. 64 bit - ./scripts/publish-mingw-x.sh + ./scripts/publish-mingw-x.sh -> mingw32/Openscad-$VERSION.zip + -> mingw32/Openscad-$VERSION-Installer.exe o FIXME: Run some tests diff --git a/scripts/publish-mingw-x.sh b/scripts/publish-mingw-x.sh index 1f23ace..0dc99ea 100755 --- a/scripts/publish-mingw-x.sh +++ b/scripts/publish-mingw-x.sh @@ -1,5 +1,7 @@ #!/bin/sh +# This is run as part of the checklist in docs/release-checklist.txt +# # Set this if we're doing a release build. Comment it out for development builds #VERSION=2011.12 @@ -13,6 +15,13 @@ CCACHE_DISABLE=1 . ./scripts/setenv-mingw-xbuild.sh +if [ ! -e $MXEDIR ]; then + echo "Mingw cross tools not found." + echo " Please run ./scripts/mingw-x-build-dependencies.sh to install " + echo " or modify MXEDIR to point to the root of your cross-tools setup" + echo " ( Please see setenv-mingw-xbuild.sh for more info ) " +fi + if [ ! -f $OPENSCADDIR/openscad.pro ]; then echo "Must be run from the OpenSCAD source root directory" exit 0 @@ -20,9 +29,8 @@ fi OS=LINXWIN ./scripts/release-common.sh -v $VERSION $COMMIT -echo $? return value - if [ $? != 0 ]; then + echo "release-common.sh returned error code: $?. build stopped." exit 1 fi -- cgit v0.10.1