Commit a3320e6a authored by Rye Mutt's avatar Rye Mutt 🍞

Update to cef to 75.1.4+g4210896+chromium-75.0.3770.100

parent 2ea28648
......@@ -27,23 +27,30 @@ source_environment_tempfile="$stage/source_environment.sh"
"$AUTOBUILD" source_environment > "$source_environment_tempfile"
. "$source_environment_tempfile"
# version number to build (this is what to change to updatge CEF build)
# version number to build (this is what to change to update CEF build)
# it will get propagated into the URLs below
CEF_PACKAGE_VERSION="73.1.12-gee4b49f-chromium-73.0.3683.75"
CEF_PACKAGE_VERSION="75.1.14+gc81164e+chromium-75.0.3770.100"
# URLs of the CEF bundle to download
CEF_BUNDLE_URL_WINDOWS32="http://depot.alchemyviewer.org/pub/packages/cef-builds/cef_binary_"$CEF_PACKAGE_VERSION"_windows32.tar.bz2"
CEF_BUNDLE_URL_WINDOWS64="http://depot.alchemyviewer.org/pub/packages/cef-builds/cef_binary_"$CEF_PACKAGE_VERSION"_windows64.tar.bz2"
CEF_BUNDLE_URL_DARWIN64="http://depot.alchemyviewer.org/pub/packages/cef-builds/cef_binary_"$CEF_PACKAGE_VERSION"_macosx64.tar.bz2"
CEF_BUNDLE_URL_WINDOWS32="https://cef.dl.alchemyviewer.org/cef_binary_"$CEF_PACKAGE_VERSION"_windows32.tar.bz2"
CEF_SYM_BUNDLE_URL_WINDOWS32="https://cef.dl.alchemyviewer.org/cef_binary_"$CEF_PACKAGE_VERSION"_windows64_release_symbols.tar.bz2"
CEF_BUNDLE_URL_WINDOWS64="https://cef.dl.alchemyviewer.org/cef_binary_"$CEF_PACKAGE_VERSION"_windows64.tar.bz2"
CEF_SYM_BUNDLE_URL_WINDOWS64="https://cef.dl.alchemyviewer.org/cef_binary_"$CEF_PACKAGE_VERSION"_windows64_release_symbols.tar.bz2"
CEF_BUNDLE_URL_DARWIN64="https://cef.dl.alchemyviewer.org/cef_binary_"$CEF_PACKAGE_VERSION"_macosx64.tar.bz2"
CEF_SYM_BUNDLE_URL_DARWIN64="https://cef.dl.alchemyviewer.org/cef_binary_"$CEF_PACKAGE_VERSION"_macosx64_release_symbols.tar.bz2"
# file where the CEF bundle will be downloaded to before unpacking etc.
CEF_BUNDLE_DOWNLOAD_FILE_WINDOWS="${top}/stage/windows${AUTOBUILD_ADDRSIZE}.bz2"
CEF_SYM_BUNDLE_DOWNLOAD_FILE_WINDOWS="${top}/stage/windows${AUTOBUILD_ADDRSIZE}sym.bz2"
CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64="${top}/stage/darwin64.bz2"
CEF_SYM_BUNDLE_DOWNLOAD_FILE_DARWIN64="${top}/stage/darwin64sym.bz2"
# directories where the downloaded, unpacked, modified and ready to build CEF
# bundle will end up and where it will be built by Cmake
CEF_BUNDLE_SRC_DIR_WINDOWS="${top}/stage/windows${AUTOBUILD_ADDRSIZE}"
CEF_SYM_BUNDLE_SRC_DIR_WINDOWS="${top}/stage/windows${AUTOBUILD_ADDRSIZE}sym"
CEF_BUNDLE_SRC_DIR_DARWIN64="${top}/stage/darwin64"
CEF_SYM_BUNDLE_SRC_DIR_DARWIN64="${top}/stage/darwin64sym"
# used in VERSION.txt but common to all bit-widths and platforms
build=${AUTOBUILD_BUILD_ID:=0}
......@@ -52,23 +59,22 @@ case "$AUTOBUILD_PLATFORM" in
windows*)
# download bundle
CEF_BUNDLE_URL="CEF_BUNDLE_URL_WINDOWS${AUTOBUILD_ADDRSIZE}"
CEF_SYM_BUNDLE_URL="CEF_SYM_BUNDLE_URL_WINDOWS${AUTOBUILD_ADDRSIZE}"
/usr/bin/curl "${!CEF_BUNDLE_URL}" -o "${CEF_BUNDLE_DOWNLOAD_FILE_WINDOWS}"
/usr/bin/curl "${!CEF_SYM_BUNDLE_URL}" -o "${CEF_SYM_BUNDLE_DOWNLOAD_FILE_WINDOWS}"
# Create directory for it and untar, stripping off the complex CEF name
mkdir -p "${CEF_BUNDLE_SRC_DIR_WINDOWS}"
mkdir -p "${CEF_SYM_BUNDLE_SRC_DIR_WINDOWS}"
/usr/bin/tar xvfj "${CEF_BUNDLE_DOWNLOAD_FILE_WINDOWS}" -C "${CEF_BUNDLE_SRC_DIR_WINDOWS}" --strip-components=1
# replace the Visual Studio C++ Run Time setting to ones that matches viewer
# Note: we don't build/use the debug version but it's included here for completeness
sed -i -e 's/\/MTd/\/MDd/g' "${CEF_BUNDLE_SRC_DIR_WINDOWS}/cmake/cef_variables.cmake"
sed -i -e 's/\/MT/\/MD/g' "${CEF_BUNDLE_SRC_DIR_WINDOWS}/cmake/cef_variables.cmake"
/usr/bin/tar xvfj "${CEF_SYM_BUNDLE_DOWNLOAD_FILE_WINDOWS}" -C "${CEF_SYM_BUNDLE_SRC_DIR_WINDOWS}" --strip-components=1
# create solution file cef.sln in build folder
cd "${CEF_BUNDLE_SRC_DIR_WINDOWS}"
rm -rf build
mkdir -p build
cd build
cmake -G "$AUTOBUILD_WIN_CMAKE_GEN" -A${AUTOBUILD_WIN_VSPLATFORM} ..
cmake -G "$AUTOBUILD_WIN_CMAKE_GEN" -A${AUTOBUILD_WIN_VSPLATFORM} -DCEF_RUNTIME_LIBRARY_FLAG="/MD" -DCEF_DEBUG_INFO_FLAG="/Z7" ..
# build release version of wrapper only
build_sln cef.sln "Release" "$AUTOBUILD_WIN_VSPLATFORM" "libcef_dll_wrapper"
......@@ -83,7 +89,6 @@ case "$AUTOBUILD_PLATFORM" in
# binary files
cp "${CEF_BUNDLE_SRC_DIR_WINDOWS}/release/chrome_elf.dll" "$stage/bin/release/"
cp "${CEF_BUNDLE_SRC_DIR_WINDOWS}/release/d3dcompiler_43.dll" "$stage/bin/release/"
cp "${CEF_BUNDLE_SRC_DIR_WINDOWS}/release/d3dcompiler_47.dll" "$stage/bin/release/"
cp "${CEF_BUNDLE_SRC_DIR_WINDOWS}/release/libcef.dll" "$stage/bin/release/"
cp "${CEF_BUNDLE_SRC_DIR_WINDOWS}/release/libEGL.dll" "$stage/bin/release/"
......@@ -107,6 +112,9 @@ case "$AUTOBUILD_PLATFORM" in
# license file
cp "${CEF_BUNDLE_SRC_DIR_WINDOWS}/LICENSE.txt" "$stage/LICENSES/cef.txt"
# pdb files
cp "${CEF_SYM_BUNDLE_SRC_DIR_WINDOWS}/libcef.dll.pdb" "$stage/bin/release/"
# populate version_file (after header files are copied to a well specified place that version.cpp can access)
cl \
/Fo"$(cygpath -w "$stage/version.obj")" \
......@@ -117,6 +125,7 @@ case "$AUTOBUILD_PLATFORM" in
"$(cygpath -w "$top/version.cpp")"
"$stage/version.exe" > "$stage/version.txt"
rm "$stage"/version.{obj,exe}
;;
darwin64)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment