Commit baa98ff3 authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Merge

parents 0f7edb79 01101ffe
...@@ -77,7 +77,7 @@ case "$AUTOBUILD_PLATFORM" in ...@@ -77,7 +77,7 @@ case "$AUTOBUILD_PLATFORM" in
cmake -G "$AUTOBUILD_WIN_CMAKE_GEN" -A${AUTOBUILD_WIN_VSPLATFORM} -DCEF_RUNTIME_LIBRARY_FLAG="/MD" -DCEF_DEBUG_INFO_FLAG="/Z7" .. 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 release version of wrapper only
build_sln cef.sln "Release" "$AUTOBUILD_WIN_VSPLATFORM" "libcef_dll_wrapper" cmake --build . --config Release --target "libcef_dll_wrapper"
# create folders to stage files in # create folders to stage files in
mkdir -p "$stage/bin/release" mkdir -p "$stage/bin/release"
...@@ -132,50 +132,58 @@ case "$AUTOBUILD_PLATFORM" in ...@@ -132,50 +132,58 @@ case "$AUTOBUILD_PLATFORM" in
darwin*) darwin*)
# download bundle # download bundle
CEF_BUNDLE_URL="CEF_BUNDLE_URL_DARWIN64" CEF_BUNDLE_URL="CEF_BUNDLE_URL_DARWIN64"
CEF_SYM_BUNDLE_URL="CEF_SYM_BUNDLE_URL_DARWIN64"
curl "${!CEF_BUNDLE_URL}" -o "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}" curl "${!CEF_BUNDLE_URL}" -o "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}"
curl "${!CEF_SYM_BUNDLE_URL}" -o "${CEF_SYM_BUNDLE_DOWNLOAD_FILE_DARWIN64}"
# Create directory for it and untar, stripping off the complex CEF name # Create directory for it and untar, stripping off the complex CEF name
mkdir -p "${CEF_BUNDLE_SRC_DIR_DARWIN64}" mkdir -p "${CEF_BUNDLE_SRC_DIR_DARWIN64}"
mkdir -p "${CEF_SYM_BUNDLE_SRC_DIR_DARWIN64}"
tar xvfj "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}" -C "${CEF_BUNDLE_SRC_DIR_DARWIN64}" --strip-components=1 tar xvfj "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}" -C "${CEF_BUNDLE_SRC_DIR_DARWIN64}" --strip-components=1
tar xvfj "${CEF_SYM_BUNDLE_DOWNLOAD_FILE_DARWIN64}" -C "${CEF_SYM_BUNDLE_SRC_DIR_DARWIN64}" --strip-components=1
BUILD_FOLDER="build"
cd "${CEF_BUNDLE_SRC_DIR_DARWIN64}" cd "${CEF_BUNDLE_SRC_DIR_DARWIN64}"
BUILD_FOLDER="build"
rm -rf "${BUILD_FOLDER}" rm -rf "${BUILD_FOLDER}"
mkdir -p "${BUILD_FOLDER}" mkdir -p "${BUILD_FOLDER}"
cd "${BUILD_FOLDER}" pushd "${BUILD_FOLDER}"
cmake -G "Xcode" -DPROJECT_ARCH="x86_64" .. -DCMAKE_OSX_SYSROOT="macosx10.15"
cmake -G "Xcode" -DPROJECT_ARCH="x86_64" .. cmake --build . --config Release --target libcef_dll_wrapper
xcodebuild -project cef.xcodeproj -target libcef_dll_wrapper -configuration Release # create folders to stage files in
mkdir -p "$stage/bin/release"
# create folders to stage files in mkdir -p "$stage/include/cef/include"
mkdir -p "$stage/bin/release" mkdir -p "$stage/lib/release"
mkdir -p "$stage/include/cef/include" mkdir -p "$stage/LICENSES"
mkdir -p "$stage/lib/release"
mkdir -p "$stage/LICENSES" # include files
cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
# include files
cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/" # library file
cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/${BUILD_FOLDER}/libcef_dll_wrapper/Release/libcef_dll_wrapper.a" "$stage/lib/release/"
# library file
cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/${BUILD_FOLDER}/libcef_dll_wrapper/Release/libcef_dll_wrapper.a" "$stage/lib/release/" # framework
cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/Chromium Embedded Framework.framework" "$stage/bin/release/"
# framework cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/cef_sandbox.a" "$stage/lib/release/"
cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/Chromium Embedded Framework.framework" "$stage/bin/release/"
# include files
# include files cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
# license file
# license file cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
# pdb files
# populate version_file cp -a "${CEF_SYM_BUNDLE_SRC_DIR_DARWIN64}/Chromium Embedded Framework.dSYM" "$stage/bin/release/"
clang++ -I "$stage/include/cef/include" \
-I "$stage/include/cef" \ # populate version_file
-D "AUTOBUILD_BUILD=${build}" \ clang++ -I "$stage/include/cef/include" \
-o "$stage/version" "$top/version.cpp" -I "$stage/include/cef" \
"$stage/version" > "$stage/VERSION.txt" -D "AUTOBUILD_BUILD=${build}" \
rm "$stage/version" -o "$stage/version" "$top/version.cpp"
"$stage/version" > "$stage/VERSION.txt"
rm "$stage/version"
popd
;; ;;
linux*) 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