Commit 8e46ec09 authored by Drake Arconis's avatar Drake Arconis

Fix mac build for alchemy

parent 12f49cde
......@@ -39,7 +39,7 @@
<key>name</key>
<string>common</string>
</map>
<key>darwin64</key>
<key>darwin</key>
<map>
<key>build_directory</key>
<string>stage</string>
......
......@@ -128,7 +128,7 @@ case "$AUTOBUILD_PLATFORM" in
;;
darwin64)
darwin*)
# download bundle
CEF_BUNDLE_URL="CEF_BUNDLE_URL_DARWIN64"
curl "${!CEF_BUNDLE_URL}" -o "${CEF_BUNDLE_DOWNLOAD_FILE_DARWIN64}"
......@@ -137,11 +137,6 @@ case "$AUTOBUILD_PLATFORM" in
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_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_BUNDLE_SRC_DIR_DARWIN64}"
rm -rf "${BUILD_FOLDER}"
......@@ -172,6 +167,14 @@ case "$AUTOBUILD_PLATFORM" in
# license file
cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
# populate version_file
clang++ -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"
;;
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