Build changes

3rd_party/CEF/create.cmd

@@ -3,8 +3,11 @@ set ROOT=%~dp0%
 set MODE=%1
 pushd %ROOT%
 
-set PATH=%ROOT%depot_tools;%PATH%
+setlocal
 call create_common.cmd
+endlocal
+
+set PATH=%ROOT%depot_tools;%PATH%
 
 set CEF_USE_GN=1
 if ("%MODE%"=="Debug") (
@@ -18,7 +21,7 @@ pushd chromium_git
   call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build --branch=3029 || goto :ERROR
 popd
 
-pushd chromium_git\chromium\src\cef
+pushd chromium_git\chromium\src\cef  
   call cef_create_projects.bat
 popd
 

3rd_party/CEF/create_common.cmd

@@ -4,20 +4,28 @@ pushd "%ROOT%"
 
 set PATH=%ROOT%..\..\bin;%PATH%
 
-mkdir automate
-mkdir chromium_git
-mkdir depot_tools
+mkdir automate >NUL 2>&1
+mkdir chromium_git >NUL 2>&1
+mkdir depot_tools >NUL 2>&1
 
-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
-del /q depot_tools.zip > NUL
-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
-popd
+if not exist "automate\automate-git.py" (
+  del /q automate-git.py > NUL
+  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
+)
 
+if not exist "depot_tools.complete" (
+  del /q depot_tools.zip > NUL
+  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 > NUL
+
+  pushd depot_tools
+    call update_depot_tools.bat
+  popd
+  
+  echo "1">depot_tools.complete
+)
 goto :END
 
 :ERROR

3rd_party/CEF/depot_tools.complete

@@ -0,0 +1 @@
+"1"

build.cmd

@@ -0,0 +1,25 @@
+@echo off
+set ROOT=%~dp0%
+set TARGET_MODE=%1
+pushd "%ROOT%"
+
+set CMAKE=%ROOT%bin\cmake-3.7.2-win64-x64\bin\cmake
+
+setlocal
+call build_common.cmd
+endlocal
+
+setlocal
+call 3rd_party\CEF\create.cmd %TARGET_MODE%
+endlocal
+
+mkdir build > NUL
+mkdir build\%TARGET_MODE% > NUL
+pushd build\%TARGET_MODE% > NUL
+  (%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%TARGET_MODE% -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\%TARGET_MODE%" ..\..) && (
+    %CMAKE% --build . --config %TARGET_MODE%) && (
+    %CMAKE% --build . --target install --config %TARGET_MODE%
+  )
+popd
+
+popd

build_common.cmd

@@ -1,19 +1,20 @@
 @echo off
 set ROOT=%~dp0%
 set PATH=%ROOT%bin;%PATH%
-
 pushd "%ROOT%"
 
-if NOT EXIST "bin\cmake-3.7.2-win64-x64\bin\cmake.exe" (
+if NOT EXIST ".\bin\cmake-3.7.2-win64-x64\bin\cmake.exe" (
+  del /q cmake-3.7.2-win64-x64.zip > NUL
   wget --no-check-certificate https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.zip || goto :ERROR
   unzip -o -q -d bin\ cmake-3.7.2-win64-x64.zip || goto :ERROR
-  del /q cmake-3.7.2-win64-x64.zip || goto :ERROR
+  del /q cmake-3.7.2-win64-x64.zip > NUL
 )
 
-if NOT EXIST "bin\nsis-3.01\nsis.exe" (
+if NOT EXIST "bin\nsis-3.01\NSIS.exe" (
+  del /q nsis-3.01.zip > NUL
   wget --no-check-certificate "https://sourceforge.net/projects/nsis/files/NSIS 3/3.01/nsis-3.01.zip/download"  || goto :ERROR
   unzip -o -q -d bin\ nsis-3.01.zip || goto :ERROR
-  del /q nsis-3.01.zip
+  del /q nsis-3.01.zip > NUL
 )
 
 goto :END

build_debug_x64.cmd

@@ -1,18 +1,5 @@
 @echo off
-set ROOT1=%~dp0%
-pushd "%ROOT1%"
-
-call build_common.cmd
-set CMAKE=%ROOT1%bin\cmake-3.7.2-win64-x64\bin\cmake
-
-call 3rd_party\CEF\create.cmd Debug
-
-mkdir build
-mkdir build\debug
-pushd build\debug
-  %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DSIADRIVE_INSTALL_FOLDER="%ROOT1%dist\Debug" ..\..
-  %CMAKE% --build . --config Debug && %CMAKE% --build . --target install --config Debug
-popd
-
+pushd "%~dp0%"
+call build.cmd Debug
 pause
 popd

build_release_x64.cmd

@@ -1,18 +1,5 @@
 @echo off
-set ROOT1=%~dp0%
-pushd "%ROOT1%"
-
-call build_common.cmd
-set CMAKE=%ROOT1%bin\cmake-3.7.2-win64-x64\bin\cmake
-
-call 3rd_party\CEF\create.cmd Release
-
-mkdir build
-mkdir build\release
-pushd build\release
-  %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DSIADRIVE_INSTALL_FOLDER="%ROOT1%dist\Release" ..\..
-  %CMAKE% --build . --config Release && %CMAKE% --build . --config Release --target install
-popd
-
+pushd "%~dp0%"
+call build.cmd Release
 pause
 popd