diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/builder.sh | 12 | ||||
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 4 | ||||
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/scripts/builder.sh b/scripts/builder.sh index ca7e5b2..f1a253e 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -99,6 +99,12 @@ build_win32() . ./scripts/setenv-mingw-xbuild.sh ./scripts/mingw-x-build-dependencies.sh ./scripts/release-common.sh mingw32 + if [ "`echo $? | grep 0`" ]; then + echo build of win32 stage over + else + echo build of win32 failed. exiting + exit 1 + fi DATECODE=`date +"%Y.%m.%d"` export DATECODE } @@ -109,6 +115,12 @@ build_win64() . ./scripts/setenv-mingw-xbuild.sh 64 ./scripts/mingw-x-build-dependencies.sh 64 ./scripts/release-common.sh mingw64 + if [ "`echo $? | grep 0`" ]; then + echo build of win64 stage over + else + echo build of win64 failed. exiting + exit 1 + fi DATECODE=`date +"%Y.%m.%d"` export DATECODE } diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 45f6818..ce555ca 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -495,12 +495,8 @@ build_boost 1.54.0 # NB! For CGAL, also update the actual download URL in the function build_cgal 4.3 build_glew 1.10.0 -<<<<<<< HEAD build_gettext 0.18.3.1 build_glib2 2.38.2 -======= -build_glib2 2.38.1 ->>>>>>> d7d5bea7363703c76b9787598304bfc838e893ee build_opencsg 1.3.2 if $OPTION_DEPLOY; then # build_sparkle andymatuschak 0ed83cf9f2eeb425d4fdd141c01a29d843970c20 diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index c0f658d..3df823c 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -61,16 +61,16 @@ cd $MXEDIR if [ "`echo $* | grep 64`" ]; then MXE_TARGETS='x86_64-w64-mingw32' if [ "`echo $* | grep download`" ]; then - PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt' + PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt download-glib' else - PACKAGES='mpfr eigen opencsg cgal qt' + PACKAGES='mpfr eigen opencsg cgal qt glib' fi else MXE_TARGETS='i686-pc-mingw32' # fixme - does this work? test it. if [ "`echo $* | grep download`" ]; then - PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt download-nsis' + PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt download-nsis download-glib' else - PACKAGES='mpfr eigen opencsg cgal qt nsis' + PACKAGES='mpfr eigen opencsg cgal qt nsis glib' fi fi echo make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS |