diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e87c6a4..5e7d360 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -76,9 +76,10 @@ 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 "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 if: startsWith(github.event.ref, 'refs/tags/') diff --git a/build_for_win.bat b/ci/win/build_for_win.bat similarity index 89% rename from build_for_win.bat rename to ci/win/build_for_win.bat index ec3f3ef..e946f5d 100644 --- a/build_for_win.bat +++ b/ci/win/build_for_win.bat @@ -1,6 +1,7 @@ @echo off -set vcvarsall="D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" -set qt_msvc_path="D:\Qt\Qt5.12.5\5.12.5\" +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 build_path_name="../build-win" :: 获取脚本绝对路径 set script_path=%~dp0 @@ -8,6 +9,8 @@ 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 @@ -47,7 +50,6 @@ if /i %cpu_mode% == x86 ( set qt_msvc_path=%qt_msvc_path%msvc2017_64\bin ) -set build_path=%script_path%build set PATH=%qt_msvc_path%;%PATH% :: 注册vc环境 diff --git a/publish_for_win.bat b/ci/win/publish_for_win.bat similarity index 100% rename from publish_for_win.bat rename to ci/win/publish_for_win.bat