From 434b9e107e8203986756bad9af759de70489b293 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 6 Aug 2020 16:33:34 -0700 Subject: [PATCH] devops: support EXPORT_COMPILE_COMMANDS env variable in webkit build.sh (#3334) We'll use this variable to power kodsearch. --- browser_patches/webkit/build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh index 505f551d24..c225b7213c 100755 --- a/browser_patches/webkit/build.sh +++ b/browser_patches/webkit/build.sh @@ -9,14 +9,22 @@ build_gtk() { if ! [[ -d ./WebKitBuild/GTK/DependenciesGTK ]]; then yes | WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs fi - WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/build-webkit --gtk --release --touch-events --orientation-events --no-bubblewrap-sandbox MiniBrowser + local CMAKE_ARGS="" + if [[ -n "${EXPORT_COMPILE_COMMANDS}" ]]; then + CMAKE_ARGS="--cmakeargs=\"-DCMAKE_EXPORT_COMPILE_COMMANDS=1\"" + fi + WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/build-webkit --gtk --release "${CMAKE_ARGS}" --touch-events --orientation-events --no-bubblewrap-sandbox MiniBrowser } build_wpe() { if ! [[ -d ./WebKitBuild/WPE/DependenciesWPE ]]; then yes | WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitwpe-libs fi - WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/build-webkit --wpe --release --touch-events --orientation-events --no-bubblewrap-sandbox MiniBrowser + local CMAKE_ARGS="" + if [[ -n "${EXPORT_COMPILE_COMMANDS}" ]]; then + CMAKE_ARGS="--cmakeargs=\"-DCMAKE_EXPORT_COMPILE_COMMANDS=1\"" + fi + WEBKIT_JHBUILD=1 WEBKIT_JHBUILD_MODULESET=minimal WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/build-webkit --wpe --release "${CMAKE_ARGS}" --touch-events --orientation-events --no-bubblewrap-sandbox MiniBrowser } if [[ "$(uname)" == "Darwin" ]]; then