Skip to content

Commit 584d755

Browse files
committed
Updated for 8x series building, no longer get latest depot tools as may not support older branches
1 parent 420db67 commit 584d755

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile_cefsharp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
33
RUN MKDIR c:/code/cefsharp
44
WORKDIR c:/code/cefsharp
55
RUN $env:Path = 'c:/Program Files/Git/bin/;' + $env:Path;setx /M PATH $env:Path;
6+
ARG CEFSHARP_VERSION=63.0.90
67
RUN git clone https://github.com/cefsharp/CefSharp.git .
78
ARG CEFSHARP_BRANCH="cefsharp/63"
89
#This line and the one two below are due to waiting to use the new vs2017 compat build script
910
RUN cp build.ps1 ../
1011
RUN git checkout $env:CEFSHARP_BRANCH;
1112
RUN cp ../build.ps1 .
12-
ARG CEFSHARP_VERSION=63.0.90
1313
ARG CEF_VERSION_STR=auto
1414
ARG CHROME_BRANCH=3239
1515
ENV PACKAGE_SOURCE C:/code/cef-binary/cef-binary-master/NuGet

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if (! $NoMemoryWarn){
5454
}
5555
}
5656
}
57-
if (! $NoVS2019PatchCopy){
57+
if (! $NoVS2019PatchCopy -and $VAR_CHROME_BRANCH -lt 4103 ){
5858
if ( (Test-Path "cef_patch_find_vs2019_tools.diff") -eq $false){
5959
Copy-Item sample_patches/cef_patch_find_vs2019_tools.diff -Destination .
6060
}

cef_build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Function RunBuild{
4848
Param($build_args_add,$version)
4949
return RunProc -verbose_mode "host" -proc "c:/code/depot_tools/ninja.exe" -opts "$build_args_add -C out/Release_GN_$version cefclient" -no_wait;
5050
}
51-
RunProc -proc "c:/code/depot_tools/python.bat" -errok -opts "c:/code/automate/automate-git.py --download-dir=c:/code/chromium_git --branch=$env:CHROME_BRANCH --no-build --no-debug-build --no-distrib";
51+
RunProc -proc "c:/code/depot_tools/python.bat" -errok -opts "c:/code/automate/automate-git.py --download-dir=c:/code/chromium_git --branch=$env:CHROME_BRANCH --no-build --no-debug-build --no-distrib --no-depot-tools-update";
5252
Set-Location -Path c:/code/chromium_git/chromium/src/cef;
5353
if (! (Test-Path /code/chromium_git/already_patched -PathType Leaf)){
5454
copy c:/code/*.ps1 .

0 commit comments

Comments
 (0)