vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Stop early when QtBase or QtWebKit failed to compile. 

Currently, the build script will continue to try to build PhantomJS
even when either QtBase or QtWebKit failed to compile. In such a
case, the script should return early and emit an error message.

https://github.com/ariya/phantomjs/issues/12433
2.0
Milian Wolff 2014-08-06 15:50:12 +02:00 committed by Ariya Hidayat
parent 4bf75c50b0
commit aa0300607c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.sh
View File

@ -107,14 +107,15 @@ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
echo "System architecture... ($UNAME_SYSTEM $UNAME_RELEASE $UNAME_MACHINE)"
echo
cd src/qt && ./preconfig.sh --jobs $COMPILE_JOBS --qt-config "$QT_CFG" $SILENT
echo "Building QtBase library. Please wait..."
echo
(cd src/qt && ./preconfig.sh --jobs $COMPILE_JOBS --qt-config "$QT_CFG" $SILENT) || (echo "Failed to compile QtBase"; exit 1)
echo "Building QtWebKit library. Please wait..."
echo
export SQLITE3SRCDIR=$PWD/qtbase/3rdparty/sqlite/
cd qtwebkit
../qtbase/bin/qmake $QMAKE_ARGS
make -j$COMPILE_JOBS
cd ../../..
(cd qtwebkit && ../qtbase/bin/qmake $QMAKE_ARGS && make -j$COMPILE_JOBS) || (echo "Failed to compile QtWebKit"; exit 1)
echo "Building main PhantomJS application. Please wait..."
echo
src/qt/qtbase/bin/qmake $QMAKE_ARGS
make -j$COMPILE_JOBS
(cd ../../.. && src/qt/qtbase/bin/qmake $QMAKE_ARGS && make -j$COMPILE_JOBS) || (echo "Failed to compile PhantomJS"; exit 1)