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

Add option to build against system qtbase but bundled qtwebkit. 

As with the system-qtwebkit option, this does not actually work at this
point, but it enables experimentation toward getting it to work.

Part of issue #12467.
2.0
Zack Weinberg 2014-08-18 11:28:25 -04:00 committed by Ariya Hidayat
parent 9254f6855e
commit e9e6f30e69
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build.sh
View File

@ -34,6 +34,7 @@ if [[ "$COMPILE_JOBS" -gt 8 ]]; then
fi
SILENT=''
QTCORE=bundled
QTWEBKIT=bundled
until [ -z "$1" ]; do
@ -56,7 +57,11 @@ until [ -z "$1" ]; do
"--silent")
SILENT=silent
shift;;
"--system-qt")
QTCORE=system
shift;;
"--system-qtwebkit")
QTCORE=system
QTWEBKIT=system
shift;;
"--help")
@ -66,18 +71,19 @@ until [ -z "$1" ]; do
echo " --qt-config CONFIG Specify extra config options to be used when configuring Qt"
echo " --jobs NUM How many parallel compile jobs to use. Defaults to 4."
echo " --silent Produce less verbose output."
echo " --system-qtwebkit Use system-provided QtWebkit. EXPERIMENTAL, build may not succeed."
echo " --system-qt Use system-provided Qt core libraries. EXPERIMENTAL, build may not succeed."
echo " --system-qtwebkit Use system-provided QtWebkit. EXPERIMENTAL, build may not succeed. Implies --system-qt."
echo
exit 0
;;
*)
echo "Unrecognised option: $1"
echo "Unrecognised option: $1" >&2
exit 1;;
esac
done
if [[ "$QTWEBKIT" = system ]] && [[ -n "$QT_CFG" ]]; then
echo "$0: options --qt-config and --system-qtwebkit are mutually exclusive" >&2
if [[ "$QTCORE" = system ]] && [[ -n "$QT_CFG" ]]; then
echo "$0: --qt-config and --system-qt(webkit) are mutually exclusive" >&2
exit 1
fi
@ -117,23 +123,15 @@ fi
echo "System architecture... ($UNAME_SYSTEM $UNAME_RELEASE $UNAME_MACHINE)"
echo
if [[ "$QTWEBKIT" == "bundled" ]]; then
if [[ "$QTCORE" == "bundled" ]]; then
export QMAKE=$PWD/src/qt/qtbase/bin/qmake
export SQLITE3SRCDIR=$PWD/src/qt/qtbase/3rdparty/sqlite/
( cd src/qt && ./preconfig.sh $QT_CFG )
echo
echo "Building Qt..."
echo
( cd src/qt/qtbase && make -j$COMPILE_JOBS $MAKE_S )
echo
echo "Building QtWebkit..."
echo
( cd src/qt/qtwebkit &&
$QMAKE $QMAKE_ARGS &&
make -j$COMPILE_JOBS $MAKE_S )
else
export QMAKE=qmake
# some Linux distros (e.g. Debian) allow you to parallel-install
@ -142,6 +140,15 @@ else
export QT_SELECT=qt5
fi
if [[ "$QTWEBKIT" == "bundled" ]]; then
echo
echo "Building QtWebkit..."
echo
( cd src/qt/qtwebkit &&
$QMAKE $QMAKE_ARGS &&
make -j$COMPILE_JOBS $MAKE_S )
fi
echo
echo "Building main PhantomJS application..."
echo