Commit 4c48f6ac authored by callum_linden's avatar callum_linden

Rewrite macOS portion of build script to take account of new methodology that...

Rewrite macOS portion of build script to take account of new methodology that downloads CEF rather than storing it in the repository.  Later, the URLs downloaded from will be switched to a Linden owned S3 bucket
parent c234544c
......@@ -54,7 +54,7 @@ case "$AUTOBUILD_PLATFORM" in
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
# 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"
......@@ -112,15 +112,23 @@ case "$AUTOBUILD_PLATFORM" in
;;
darwin64)
CEF_SOURCE_DIR="${CEF_BUNDLE_SRC_DIR_DARWIN64}"
#CEF_BUNDLE_SRC_DIR_DARWIN64="${CEF_BUNDLE_SRC_DIR_DARWIN64}"
# download bundle
CEF_BUNDLE_URL="CEF_BUNDLE_URL_DARWIN64"
curl "${!CEF_BUNDLE_URL}" -o "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}"
# Create directory for it and untar, stripping off the complex CEF name
mkdir -p "${CEF_BUNDLE_SRC_DIR_DARWIN64}"
tar xvfj "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}" -C "${CEF_BUNDLE_SRC_DIR_DARWIN64}" --strip-components=1
# build version number and write to autobuild version file
VERSION_HEADER_FILE="$CEF_SOURCE_DIR/include/cef_version.h"
VERSION_HEADER_FILE="$CEF_BUNDLE_SRC_DIR_DARWIN64/include/cef_version.h"
version=$(sed -n -E 's/#define CEF_VERSION "([a-z0-9.]+)"/\1/p' "${VERSION_HEADER_FILE}")
echo "${version}.${build}" > "${stage}/VERSION.txt"
BUILD_FOLDER="build"
cd "${CEF_SOURCE_DIR}"
cd "${CEF_BUNDLE_SRC_DIR_DARWIN64}"
rm -rf "${BUILD_FOLDER}"
mkdir -p "${BUILD_FOLDER}"
cd "${BUILD_FOLDER}"
......@@ -136,19 +144,19 @@ case "$AUTOBUILD_PLATFORM" in
mkdir -p "$stage/LICENSES"
# include files
cp -r "${CEF_SOURCE_DIR}/include/." "$stage/include/cef/include/"
cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
# library file
cp "${CEF_SOURCE_DIR}/${BUILD_FOLDER}/libcef_dll_wrapper/Release/libcef_dll_wrapper.a" "$stage/lib/release/"
cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/${BUILD_FOLDER}/libcef_dll_wrapper/Release/libcef_dll_wrapper.a" "$stage/lib/release/"
# framework
cp -r "${CEF_SOURCE_DIR}/Release/Chromium Embedded Framework.framework" "$stage/bin/release/"
cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/Chromium Embedded Framework.framework" "$stage/bin/release/"
# include files
cp -r "${CEF_SOURCE_DIR}/include/." "$stage/include/cef/include/"
cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
# license file
cp "${CEF_SOURCE_DIR}/LICENSE.txt" "$stage/LICENSES/cef.txt"
cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
;;
linux*)
......
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