From e925b717a0bd0fa5b35c3dc0c0679030c8303052 Mon Sep 17 00:00:00 2001 From: liuxy <391861737@qq.com> Date: Tue, 10 Dec 2019 16:11:41 +0800 Subject: [PATCH 1/2] Add solution upgrading act into the build process --- .gitignore | 3 +++ vcbuild.bat | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 68c6b47f..499e69ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ +.vs *.sln *.suo +*.vcproj *.vcxproj *.vcxproj.filters +UpgradeLog*.htm *.pyc winpty.sdf winpty.opensdf diff --git a/vcbuild.bat b/vcbuild.bat index f3787a20..6cc1cf78 100755 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -74,6 +74,13 @@ if errorlevel 1 ( exit /b 1 ) +REM ------------------------------------------------------------------------- +REM -- Upgrade the project. +devenv winpty.sln /Upgrade || ( + echo error: Solution Upgrade failed + exit /b 1 +) + REM ------------------------------------------------------------------------- REM -- Compile the project. From a775145349e13f2a5adcd486754daea517f4b34b Mon Sep 17 00:00:00 2001 From: liuxy <391861737@qq.com> Date: Tue, 10 Dec 2019 16:21:18 +0800 Subject: [PATCH 2/2] Make the upgrading act not that fatal --- vcbuild.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index 6cc1cf78..2a83379d 100755 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -76,9 +76,8 @@ if errorlevel 1 ( REM ------------------------------------------------------------------------- REM -- Upgrade the project. -devenv winpty.sln /Upgrade || ( - echo error: Solution Upgrade failed - exit /b 1 +devenv winpty.sln /Upgrade 2>nul || ( + echo warning: Solution upgrade not yet succeeded ) REM -------------------------------------------------------------------------