diff --git a/.travis.yml b/.travis.yml index 9e3b28ca4e0..bbfecf4dc70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,7 @@ script: - if [[ "${BOINC_TYPE}" == "client" ]]; then ( ./configure --disable-server --disable-manager && make ) fi - if [[ "${BOINC_TYPE}" == "apps" ]]; then ( ./configure --enable-apps --disable-server --disable-client --disable-manager && make ) fi - if [[ "${BOINC_TYPE}" == "manager" && "${TRAVIS_OS_NAME}" == "linux" ]]; then ( ./3rdParty/buildLinuxDependencies.sh && ./configure --disable-server --disable-client --with-wx-prefix=${TRAVIS_BUILD_DIR}/3rdParty/buildCache/linux && make ) fi +- if [[ "${BOINC_TYPE}" == "manager" && "${TRAVIS_OS_NAME}" == "linux" ]]; then ( ./3rdParty/buildLinuxDependencies.sh --disable-webview --cache_dir ${TRAVIS_BUILD_DIR}/3rdParty/buildCache/linux2 && ./configure --disable-server --disable-client --with-wx-prefix=${TRAVIS_BUILD_DIR}/3rdParty/buildCache/linux2 && make ) fi - if [[ "${BOINC_TYPE}" == "manager" && "${TRAVIS_OS_NAME}" == "osx" ]]; then ( ./3rdParty/buildMacDependencies.sh -q && ./mac_build/buildMacBOINC-CI.sh --no_shared_headers ) fi - if [[ "${BOINC_TYPE}" == "libs-mingw" ]]; then ( cd lib && MINGW=x86_64-w64-mingw32 make -f Makefile.mingw ) fi - if [[ "${BOINC_TYPE}" == "apps-mingw" ]]; then ( cd lib && MINGW=x86_64-w64-mingw32 make -f Makefile.mingw wrapper ) fi diff --git a/3rdParty/buildLinuxDependencies.sh b/3rdParty/buildLinuxDependencies.sh index ae51b62ac00..5115394e7c9 100755 --- a/3rdParty/buildLinuxDependencies.sh +++ b/3rdParty/buildLinuxDependencies.sh @@ -63,9 +63,12 @@ while [[ $# -gt 0 ]]; do doclean="yes" ;; --debug) - wxoption="--debug" + wxoption="--debug ${wxoption}" build_config="Debug" ;; + --disable-webview) + wxoption="--disable-webview ${wxoption} " + ;; *) echo "unrecognized option $key" ;; diff --git a/3rdParty/buildWxLinux.sh b/3rdParty/buildWxLinux.sh index bfe2cf69591..326dbe6d227 100644 --- a/3rdParty/buildWxLinux.sh +++ b/3rdParty/buildWxLinux.sh @@ -62,6 +62,7 @@ fi doclean="" debug_flag="--disable-debug_flag" +webview_flag="--enable-webview" lprefix="" cmdline_prefix="" while [[ $# -gt 0 ]]; do @@ -78,6 +79,9 @@ while [[ $# -gt 0 ]]; do cmdline_prefix="--prefix=${lprefix}" shift ;; + --disable-webview) + webview_flag="--disable-webview" + ;; esac shift # past argument or value done @@ -88,7 +92,7 @@ fi mkdir -p buildgtk cd buildgtk || return 1 -../configure "${cmdline_prefix}" --with-gtk --disable-shared --enable-webview --disable-gtktest --disable-sdltest ${debug_flag} +../configure "${cmdline_prefix}" --with-gtk --disable-shared ${webview_flag} --disable-gtktest --disable-sdltest ${debug_flag} if [ $? -ne 0 ]; then cd ..; return 1; fi make 1>/dev/null # the wxWidgets build is very noisy so tune it down to warnings and errors only if [ $? -ne 0 ]; then cd ..; return 1; fi