diff --git a/windows/src/CEF_VERSION.md b/common/windows/CEF_VERSION.md similarity index 100% rename from windows/src/CEF_VERSION.md rename to common/windows/CEF_VERSION.md diff --git a/windows/src/buildtools/cef-checkout.sh b/common/windows/cef-checkout.sh similarity index 90% rename from windows/src/buildtools/cef-checkout.sh rename to common/windows/cef-checkout.sh index 301aa5c86c..645c44138c 100644 --- a/windows/src/buildtools/cef-checkout.sh +++ b/common/windows/cef-checkout.sh @@ -2,7 +2,7 @@ # Checkout a matching version of CEF for the # current release of Keyman. This tag is set in -# /windows/src/CEFVERSION.md +# /common/windows/CEFVERSION.md # Terminate script if a command returns an error set -e @@ -13,13 +13,13 @@ set -u ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh" +. "$(dirname "$THIS_SCRIPT")/../../resources/build/build-utils.sh" # . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" ## END STANDARD BUILD SCRIPT INCLUDE pushd $KEYMAN_CEF4DELPHI_ROOT > /dev/null -CEF_VERSION_MD="$KEYMAN_ROOT/windows/src/CEF_VERSION.md" +CEF_VERSION_MD="$KEYMAN_ROOT/common/windows/CEF_VERSION.md" CEF_VERSION=`cat $CEF_VERSION_MD | tr -d "[:space:]"` # Switch to the version of CEF referenced in CEF_VERSION.md diff --git a/common/windows/delphi/ext/cef4delphi.txt b/common/windows/delphi/ext/cef4delphi.txt index 3989618221..af25f48409 100644 --- a/common/windows/delphi/ext/cef4delphi.txt +++ b/common/windows/delphi/ext/cef4delphi.txt @@ -36,8 +36,8 @@ the root of the cloned repo in order to run Keyman Developer. Note that some of the files in the CEF4Delphi_binary repo are larger than 100MB, which GitHub does not handle, so they have been zipped. -buildtools/cef-checkout.sh will extract them during a release build, but -for development use, you'll need to extract them yourself. +/common/windows/cef-checkout.sh will extract them during a release +build, but for development use, you'll need to extract them yourself. Debug symbols for CEF can be found at: https://cef-builds.spotifycdn.com/index.html#windows32 diff --git a/developer/src/Makefile b/developer/src/Makefile index 3d0f86625c..ace82c13f0 100644 --- a/developer/src/Makefile +++ b/developer/src/Makefile @@ -154,9 +154,9 @@ clean-pathdefines: test-releasebuildcheck test-release-cef-path: !ifndef SC_TIMESTAMP !ifdef GIT_BASH_FOR_KEYMAN - $(GIT_BASH_FOR_KEYMAN) $(WINDOWS_ROOT)\src\buildtools\cef-checkout.sh + $(GIT_BASH_FOR_KEYMAN) $(KEYMAN_ROOT)\common\windows\cef-checkout.sh !else - start /wait $(WINDOWS_ROOT)\src\buildtools\cef-checkout.sh + start /wait $(KEYMAN_ROOT)\common\windows\cef-checkout.sh !endif !endif diff --git a/docs/build/windows.md b/docs/build/windows.md index 0c3fd4d32b..612495d820 100644 --- a/docs/build/windows.md +++ b/docs/build/windows.md @@ -293,7 +293,7 @@ repo on your local machine. The version of CEF in use is determined by CEF_VERSION.md. This maps to a branch prefixed with `v` e.g. `v89.0.18` in the CEF4Delphi_binary repository. During a -release build, the buildtools/cef-checkout.sh script will checkout the correct +release build, the common/windows/cef-checkout.sh script will checkout the correct branch of the repository automatically and extract any compressed files found in it. diff --git a/windows/src/Makefile b/windows/src/Makefile index 74283f1d6c..7cf4937876 100644 --- a/windows/src/Makefile +++ b/windows/src/Makefile @@ -113,9 +113,9 @@ clean-pathdefines: test-releasebuildcheck test-release-cef-path: !ifndef SC_TIMESTAMP !ifdef GIT_BASH_FOR_KEYMAN - $(GIT_BASH_FOR_KEYMAN) $(ROOT)\src\buildtools\cef-checkout.sh + $(GIT_BASH_FOR_KEYMAN) $(KEYMAN_ROOT)\common\windows\cef-checkout.sh !else - start /wait $(ROOT)\src\buildtools\cef-checkout.sh + start /wait $(KEYMAN_ROOT)\common\windows\cef-checkout.sh !endif !endif