From f647c45712229f7a14564934fcf2560a57e6a57d Mon Sep 17 00:00:00 2001
From: Scott Graves <sgraves@nrs.prv>
Date: Fri, 17 Mar 2017 12:27:46 -0500
Subject: [PATCH] CEF changes

---
 3rd-party/CEF/create_common.cmd  | 21 ++++++++++++++-------
 3rd-party/CEF/create_debug.cmd   | 23 ++++++++++++++++-------
 3rd-party/CEF/create_release.cmd | 19 ++++++++++++++-----
 build_debug_x64.cmd              |  2 ++
 build_release_x64.cmd            |  2 ++
 5 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/3rd-party/CEF/create_common.cmd b/3rd-party/CEF/create_common.cmd
index d80c554..621e01f 100644
--- a/3rd-party/CEF/create_common.cmd
+++ b/3rd-party/CEF/create_common.cmd
@@ -5,15 +5,22 @@ mkdir automate
 mkdir chromium_git
 mkdir depot_tools
 
-wget --no-check-certificate https://bitbucket.org/chromiumembedded/cef/raw/master/tools/automate/automate-git.py
-move /y automate-git.py automate\
+wget --no-check-certificate https://bitbucket.org/chromiumembedded/cef/raw/master/tools/automate/automate-git.py || goto :ERROR
+move /y automate-git.py automate\ || goto :ERROR
 
-wget --no-check-certificate https://storage.googleapis.com/chrome-infra/depot_tools.zip
-unzip -o -q -d depot_tools\ depot_tools.zip
-del /q depot_tools.zip 
+wget --no-check-certificate https://storage.googleapis.com/chrome-infra/depot_tools.zip || goto :ERROR
+unzip -o -q -d depot_tools\ depot_tools.zip || goto :ERROR
+del /q depot_tools.zip || goto :ERROR
 pushd depot_tools
-  call update_depot_tools.bat
+  call update_depot_tools.bat || goto :ERROR
 popd
 
+goto :END
+
+:ERROR
+pause
 popd
-pause
\ No newline at end of file
+exit 1
+
+:END
+popd
\ No newline at end of file
diff --git a/3rd-party/CEF/create_debug.cmd b/3rd-party/CEF/create_debug.cmd
index a61ab63..5dc070a 100644
--- a/3rd-party/CEF/create_debug.cmd
+++ b/3rd-party/CEF/create_debug.cmd
@@ -2,25 +2,34 @@
 set ROOT=%~dp0%
 pushd %ROOT%
 
-set PATH=%ROOT%\depot_tools;%PATH%
+set PATH=%ROOT%\depot_tools;%PATH%   
+call create_common.cmd || goto :ERROR
 
 pushd chromium_git
   set CEF_USE_GN=1
   set GN_DEFINES=is_win_fastlink=true
   set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
-  call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build
+  call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build || goto :ERROR
 popd
 
 pushd chromium_git\chromium\src\cef
   set CEF_USE_GN=1
   set GN_DEFINES=is_win_fastlink=true
   set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
-  call cef_create_projects.bat
+  call cef_create_projects.bat || goto :ERROR
 popd
  
 pushd chromium_git\chromium\src
-  call ninja -C out\Debug_GN_x64 cef
+  call ninja -C out\Debug_GN_x64 cef || goto :ERROR
 popd
- pause
- 
-popd
\ No newline at end of file
+
+goto :END
+
+:ERROR
+  pause
+  popd
+  exit 1
+
+:END
+  popd
+  exit 0
\ No newline at end of file
diff --git a/3rd-party/CEF/create_release.cmd b/3rd-party/CEF/create_release.cmd
index 20ec410..54fe7e2 100644
--- a/3rd-party/CEF/create_release.cmd
+++ b/3rd-party/CEF/create_release.cmd
@@ -3,22 +3,31 @@ set ROOT=%~dp0%
 pushd %ROOT%
 
 set PATH=%ROOT%\depot_tools;%PATH%
+call create_common.cmd || goto :ERROR
 
 pushd chromium_git
   set CEF_USE_GN=1
   set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
-  call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build
+  call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build || goto :ERROR
 popd
 
 pushd chromium_git\chromium\src\cef
   set CEF_USE_GN=1
   set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
-  call cef_create_projects.bat
+  call cef_create_projects.bat || goto :ERROR
 popd
  
 pushd chromium_git\chromium\src
-  call ninja -C out\Release_GN_x64 cef
+  call ninja -C out\Release_GN_x64 cef || goto :ERROR
 popd
-pause
 
-popd
\ No newline at end of file
+goto :END
+
+:ERROR
+  pause
+  popd
+  exit 1
+
+:END
+  popd
+  exit 0
\ No newline at end of file
diff --git a/build_debug_x64.cmd b/build_debug_x64.cmd
index 1cca2e1..baa14a9 100644
--- a/build_debug_x64.cmd
+++ b/build_debug_x64.cmd
@@ -1,6 +1,8 @@
 @echo off
 pushd "%~dp0%"
 
+call 3rd-Party\CEF\create_debug.cmd
+
 mkdir build
 mkdir build\debug
 pushd build\debug
diff --git a/build_release_x64.cmd b/build_release_x64.cmd
index 90022e5..09f37a3 100644
--- a/build_release_x64.cmd
+++ b/build_release_x64.cmd
@@ -1,6 +1,8 @@
 @echo off
 pushd "%~dp0%"
 
+call 3rd-party\CEF\create_release.cmd
+
 mkdir build
 mkdir build\release
 pushd build\release