Commit 76aad22f authored by Router Gray's avatar Router Gray

Pretty up the Linux block of the build script a bit, and make it skip the...

Pretty up the Linux block of the build script a bit, and make it skip the download if the CEF bundle is already available locally.  Todo:  make that do a checksum validation, as well as cache the bundle outside the repo.
parent e459aa09
......@@ -205,38 +205,41 @@ case "$AUTOBUILD_PLATFORM" in
tar xvfj "${CEF_BUNDLE_DOWNLOAD_FILE_LINUX64}" -C "${CEF_BUNDLE_SRC_DIR_LINUX64}" --strip-components=1
cd "${CEF_BUNDLE_SRC_DIR_LINUX64}"
rm -rf build
mkdir -p build
cd build
BUILD_FOLDER="build"
rm -rf "${BUILD_FOLDER}"
mkdir -p "${BUILD_FOLDER}"
pushd "${BUILD_FOLDER}"
cmake .. -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_CXX_FLAGS=-m${AUTOBUILD_ADDRSIZE} || true
make -j4 libcef_dll_wrapper
cd ../..
cmake .. -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 \
-DCMAKE_CXX_FLAGS="-m${AUTOBUILD_ADDRSIZE} -fPIC -std=c++14" \
-DCMAKE_BUILD_TYPE="Release"
make -j4 libcef_dll_wrapper
mkdir -p "${stage}/include/cef/include"
mkdir -p "${stage}/lib/release"
mkdir -p "${stage}/resources"
mkdir -p "${stage}/LICENSES"
mkdir -p "${stage}/include/cef/include"
mkdir -p "${stage}/lib/release"
mkdir -p "${stage}/resources"
mkdir -p "${stage}/LICENSES"
# include files
cp -R ${CEF_BUNDLE_SRC_DIR_LINUX64}/include/* ${stage}/include/cef/include/
# include files
cp -R ${CEF_BUNDLE_SRC_DIR_LINUX64}/include/* ${stage}/include/cef/include/
# library file
cp ${CEF_BUNDLE_SRC_DIR_LINUX64}/build/libcef_dll_wrapper/libcef_dll_wrapper.a ${stage}/lib/release/
# library file
cp ${CEF_BUNDLE_SRC_DIR_LINUX64}/build/libcef_dll_wrapper/libcef_dll_wrapper.a ${stage}/lib/release/
# framework
cp -R ${CEF_BUNDLE_SRC_DIR_LINUX64}/Release/* ${stage}/lib/release/
cp -R ${CEF_BUNDLE_SRC_DIR_LINUX64}/Resources/* ${stage}/resources/
# framework
cp -R ${CEF_BUNDLE_SRC_DIR_LINUX64}/Release/* ${stage}/lib/release/
cp -R ${CEF_BUNDLE_SRC_DIR_LINUX64}/Resources/* ${stage}/resources/
cp "${CEF_BUNDLE_SRC_DIR_LINUX64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
cp "${CEF_BUNDLE_SRC_DIR_LINUX64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
# populate version_file
g++ -I "$stage/include/cef/include" \
-I "$stage/include/cef" \
-D "AUTOBUILD_BUILD=${build}" \
-o "$stage/version" "$top/version.cpp"
"$stage/version" > "$stage/VERSION.txt"
rm "$stage/version"
# populate version_file
g++ -I "$stage/include/cef/include" \
-I "$stage/include/cef" \
-D "AUTOBUILD_BUILD=${build}" \
-o "$stage/version" "$top/version.cpp"
"$stage/version" > "$stage/VERSION.txt"
rm "$stage/version"
popd
;;
esac
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