This commit is contained in:
rankun 2020-02-20 13:57:51 +08:00
commit b3e67457a3
2 changed files with 9 additions and 6 deletions

View file

@ -69,6 +69,9 @@ jobs:
shell: cmd shell: cmd
env: env:
vc_arch: ${{ matrix.msvc_arch }} vc_arch: ${{ matrix.msvc_arch }}
ENV_VCVARSALL: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
ENV_QT_MSVC: 'd:\a\QtScrcpy\Qt\5.12.7'
ENV_BUILD_DIR: '../build-win'
run: | run: |
call "ci\win\build_for_win.bat" release %vc_arch% call "ci\win\build_for_win.bat" release %vc_arch%
# tag 打包 # tag 打包

View file

@ -1,7 +1,8 @@
@echo off @echo off
set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" :: 从环境变量获取必要参数
set qt_msvc_path="d:\a\QtScrcpy\Qt\5.12.7\" set vcvarsall=%ENV_VCVARSALL%
set build_path_name="../build-win" set qt_msvc_path=%ENV_QT_MSVC%
set build_path_name=%ENV_BUILD_DIR%
:: 获取脚本绝对路径 :: 获取脚本绝对路径
set script_path=%~dp0 set script_path=%~dp0
@ -46,9 +47,9 @@ if /i %debug_mode% == "true" (
:: 环境变量设置 :: 环境变量设置
if /i %cpu_mode% == x86 ( if /i %cpu_mode% == x86 (
set qt_msvc_path=%qt_msvc_path%msvc2017\bin set qt_msvc_path=%qt_msvc_path%\msvc2017\bin
) else ( ) else (
set qt_msvc_path=%qt_msvc_path%msvc2017_64\bin set qt_msvc_path=%qt_msvc_path%\msvc2017_64\bin
) )
set PATH=%qt_msvc_path%;%PATH% set PATH=%qt_msvc_path%;%PATH%
@ -87,7 +88,6 @@ if /i %debug_mode% == "true" (
:: qmake ../../all.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug" :: qmake ../../all.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
qmake ../../all.pro %qmake_params% qmake ../../all.pro %qmake_params%
:: qmake ../../all.pro
if not %errorlevel%==0 ( if not %errorlevel%==0 (
echo "qmake failed" echo "qmake failed"
goto return goto return