razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Configure Actions to build with Custom Qt 5.15.2

Browse source
This commit is contained in:
manongjohn 2021-10-04 14:58:38 -04:00
parent 8ae3e5c25d
commit 380608f562
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ci-scripts/windows/tahoma-build.bat
View file

@ -13,13 +13,19 @@ REM Setup for local builds
set MSVCVERSION="Visual Studio 16 2019"
set BOOST_ROOT=C:\boost\boost_1_74_0
set OPENCV_DIR=C:\opencv\451\build
set QT_PATH=C:\Qt\5.15.2\msvc2019_64
REM set QT_PATH=C:\Qt\5.15.2\msvc2019_64
set QT_PATH=C:\Qt\5.15.2_wintab\msvc2019_64
REM These are effective when running from Actions
IF EXIST C:\local\boost_1_74_0 set BOOST_ROOT=C:\local\boost_1_74_0
IF EXIST C:\tools\opencv set OPENCV_DIR=C:\tools\opencv\build
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64 (
set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64
REM IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64 (
REM set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64
REM )
set WITH_WINTAB=Y
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15.2_wintab\msvc2019_64 (
set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15.2_wintab\msvc2019_64
)
set WITH_CANON=N
@ -28,7 +34,7 @@ IF EXIST ..\..\thirdparty\canon\Header set WITH_CANON=Y
set WITH_CRASHRPT=N
IF EXIST ..\..\thirdparty\crashrpt\include set WITH_CRASHRPT=Y
cmake ..\sources -G %MSVCVERSION% -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_CRASHRPT=%WITH_CRASHRPT%
cmake ..\sources -G %MSVCVERSION% -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_CRASHRPT=%WITH_CRASHRPT% -DWITH_WINTAB=%WITH_WINTAB%
msbuild /property:Configuration=RelWithDebInfo /m /verbosity:minimal ALL_BUILD.vcxproj

6
ci-scripts/windows/tahoma-buildpkg.bat
View file

@ -62,10 +62,12 @@ IF EXIST ..\..\thirdparty\apps\rhubarb (
echo ">>> Configuring Tahoma2D.exe for deployment"
REM Setup for local builds
set QT_PATH=C:\Qt\5.15.2\msvc2019_64
REM set QT_PATH=C:\Qt\5.15.2\msvc2019_64
set QT_PATH=C:\Qt\5.15.2_wintab\msvc2019_64
REM These are effective when running from Actions/Appveyor
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64 set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64
REM IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64 set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15.2_wintab\msvc2019_64 set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15.2_wintab\msvc2019_64
%QT_PATH%\bin\windeployqt.exe Tahoma2D\Tahoma2D.exe

16
ci-scripts/windows/tahoma-install.bat
View file

@ -1,9 +1,15 @@
choco install opencv --version=4.5.1
choco install boost-msvc-14.2
REM Install Qt 5.15
curl -fsSL -o Qt5.15.2_msvc2019_64.zip https://github.com/tahoma2d/qt5/releases/download/v5.15.2/Qt5.15.2_msvc2019_64.zip
7z x Qt5.15.2_msvc2019_64.zip
rename Qt5.15.2_msvc2019_64 5.15
mkdir thirdparty\qt
move 5.15 thirdparty\qt
REM Install Qt 5.15
REM curl -fsSL -o Qt5.15.2_msvc2019_64.zip https://github.com/tahoma2d/qt5/releases/download/v5.15.2/Qt5.15.2_msvc2019_64.zip
REM 7z x Qt5.15.2_msvc2019_64.zip
REM rename Qt5.15.2_msvc2019_64 5.15
REM move 5.15 thirdparty\qt
REM Install Custom Qt 5.15.2 with WinTab support
curl -fsSL -o Qt5.15.2_wintab.zip https://github.com/tahoma2d/qt5/releases/download/v5.15.2/Qt5.15.2_wintab.zip
7z x Qt5.15.2_wintab.zip
move Qt5.15.2_wintab\5.15.2_wintab thirdparty\qt