From 86690b8a064d142b0a4506ef53ba7d89f5e1f023 Mon Sep 17 00:00:00 2001
From: rankun <rankun@bytedance.com>
Date: Thu, 20 Feb 2020 09:11:07 +0800
Subject: [PATCH] 1

---
 .github/workflows/windows.yml |  3 ---
 ci/win/build_for_win.bat      | 32 ++++++++++++++++++--------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5e7d360..d28297a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -76,9 +76,6 @@ jobs:
         env:
           vc_arch: ${{ matrix.msvc_arch }}
         run: |
-          # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %vc_arch%
-          # qmake
-          # nmake
           call "ci\win\build_for_win.bat" release %vc_arch%
       # tag 鎵撳寘
       - name: package
diff --git a/ci/win/build_for_win.bat b/ci/win/build_for_win.bat
index e946f5d..f8f7059 100644
--- a/ci/win/build_for_win.bat
+++ b/ci/win/build_for_win.bat
@@ -3,25 +3,26 @@ set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC
 set qt_msvc_path="d:\a\QtScrcpy\Qt\5.12.7\"
 set build_path_name="../build-win"
 
-:: 获取脚本绝对路径
+:: 鑾峰彇鑴氭湰缁濆璺緞
 set script_path=%~dp0
-:: 进入脚本所在目录,因为这会影响脚本中执行的程序的工作目录
+:: 杩涘叆鑴氭湰鎵�鍦ㄧ洰褰�,鍥犱负杩欎細褰卞搷鑴氭湰涓墽琛岀殑绋嬪簭鐨勫伐浣滅洰褰�
 set old_cd=%cd%
 cd /d %~dp0
 
 set build_path=%script_path%%build_path_name%
 
-:: 启动参数声明
+:: 鍚姩鍙傛暟澹版槑
 set debug_mode="false"
 set cpu_mode=x86
+set errno=1
 
 echo=
 echo=
 echo ---------------------------------------------------------------
-echo 检查编译参数[debug/release x86/x64]
+echo check build param[debug/release x86/x64]
 echo ---------------------------------------------------------------
 
-:: 编译参数检查 /i忽略大小写
+:: 缂栬瘧鍙傛暟妫�鏌� /i蹇界暐澶у皬鍐�
 if /i "%1"=="debug" (
     set debug_mode="true"
 )
@@ -36,14 +37,14 @@ if /i "%2"=="x64" (
     set cpu_mode=x64
 )
 
-:: 提示
+:: 鎻愮ず
 if /i %debug_mode% == "true" (
-    echo 当前编译模式为 debug %cpu_mode%
+    echo current build mode: debug %cpu_mode%
 ) else (
-    echo 当前编译模式为debug release %cpu_mode%
+    echo current build mode: release %cpu_mode%
 )
 
-:: 环境变量设置
+:: 鐜鍙橀噺璁剧疆
 if /i %cpu_mode% == x86 (
     set qt_msvc_path=%qt_msvc_path%msvc2017\bin
 ) else (
@@ -52,7 +53,7 @@ if /i %cpu_mode% == x86 (
 
 set PATH=%qt_msvc_path%;%PATH%
 
-:: 注册vc环境
+:: 娉ㄥ唽vc鐜
 if /i %cpu_mode% == x86 (
     call %vcvarsall% %cpu_mode%
 ) else (
@@ -67,7 +68,7 @@ if not %errorlevel%==0 (
 echo=
 echo=
 echo ---------------------------------------------------------------
-echo 开始qmake编译
+echo begin qmake build
 echo ---------------------------------------------------------------
 
 if exist %build_path% (          
@@ -85,7 +86,7 @@ if /i %debug_mode% == "true" (
 )
 
 :: qmake ../all.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
-qmake ../all.pro %qmake_params%
+qmake ../../all.pro %qmake_params%
 
 nmake
 
@@ -97,8 +98,11 @@ if not %errorlevel%==0 (
 echo=
 echo=
 echo ---------------------------------------------------------------
-echo 完成！
+echo finish!!!
 echo ---------------------------------------------------------------
 
+set errno=0
+
 :return
-cd %old_cd%
\ No newline at end of file
+cd %old_cd%
+exit /B %errno%
\ No newline at end of file