Merge

build-cmd.sh

@@ -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" ..
 
         # 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
         mkdir -p "$stage/bin/release"
@@ -132,50 +132,58 @@ case "$AUTOBUILD_PLATFORM" in
     darwin*)
         # download bundle
         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_SYM_BUNDLE_URL}" -o "${CEF_SYM_BUNDLE_DOWNLOAD_FILE_DARWIN64}"
 
         # Create directory for it and untar, stripping off the complex CEF name
         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_SYM_BUNDLE_DOWNLOAD_FILE_DARWIN64}" -C "${CEF_SYM_BUNDLE_SRC_DIR_DARWIN64}" --strip-components=1
 
-        BUILD_FOLDER="build"
         cd "${CEF_BUNDLE_SRC_DIR_DARWIN64}"
+
+        BUILD_FOLDER="build"
         rm -rf "${BUILD_FOLDER}"
         mkdir -p "${BUILD_FOLDER}"
-        cd "${BUILD_FOLDER}"
-
-        cmake -G "Xcode" -DPROJECT_ARCH="x86_64" ..
-
-        xcodebuild -project cef.xcodeproj -target libcef_dll_wrapper -configuration Release
-
-        # create folders to stage files in
-        mkdir -p "$stage/bin/release"
-        mkdir -p "$stage/include/cef/include"
-        mkdir -p "$stage/lib/release"
-        mkdir -p "$stage/LICENSES"
-
-        # include files
-        cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
-
-        # library file
-        cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/${BUILD_FOLDER}/libcef_dll_wrapper/Release/libcef_dll_wrapper.a" "$stage/lib/release/"
-
-        # framework
-        cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/Chromium Embedded Framework.framework" "$stage/bin/release/"
-
-        # include files
-        cp -r "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
-
-        # 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"
+        pushd "${BUILD_FOLDER}"
+            cmake -G "Xcode" -DPROJECT_ARCH="x86_64" .. -DCMAKE_OSX_SYSROOT="macosx10.15"
+            cmake --build . --config Release --target libcef_dll_wrapper
+
+            # create folders to stage files in
+            mkdir -p "$stage/bin/release"
+            mkdir -p "$stage/include/cef/include"
+            mkdir -p "$stage/lib/release"
+            mkdir -p "$stage/LICENSES"
+
+            # include files
+            cp -a "${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/"
+
+            # framework
+            cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/Chromium Embedded Framework.framework" "$stage/bin/release/"
+            cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/Release/cef_sandbox.a" "$stage/lib/release/"
+
+            # include files
+            cp -a "${CEF_BUNDLE_SRC_DIR_DARWIN64}/include/." "$stage/include/cef/include/"
+
+            # license file
+            cp "${CEF_BUNDLE_SRC_DIR_DARWIN64}/LICENSE.txt" "$stage/LICENSES/cef.txt"
+
+            # pdb files
+            cp -a "${CEF_SYM_BUNDLE_SRC_DIR_DARWIN64}/Chromium Embedded Framework.dSYM" "$stage/bin/release/"
+
+            # 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"
+        popd
     ;;
 
     linux*)