erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

chore(windows): move cef-checkout.sh to common

Browse source
This commit is contained in:
Marc Durdin 2022-06-10 12:08:05 +10:00
parent cd9cd42d8f
commit 6f50259724
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
windows/src/CEF_VERSION.md → common/windows/CEF_VERSION.md
View file

6
windows/src/buildtools/cef-checkout.sh → common/windows/cef-checkout.sh
View file

@ -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

4
common/windows/delphi/ext/cef4delphi.txt
View file

@ -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

4
developer/src/Makefile
View file

@ -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

2
docs/build/windows.md vendored
View file

@ -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.

4
windows/src/Makefile
View file

@ -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