Skip to content

Commit cf5e2d9

Browse files
committed
appveyor: attempt to fix the building of Qt6-based package
1 parent cd23c25 commit cf5e2d9

1 file changed

Lines changed: 14 additions & 15 deletions

File tree

.appveyor.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ environment:
3535
CMAKE_ARGS: -A x64 -DSCM_SHOULD_ENABLE_CONVERTER=ON
3636
exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
3737
exiv2baseName: exiv2-0.28.0-2019msvc64
38-
scConverterEnabled: 1
38+
scConverterEnabled: true
3939
- BUILD_NAME: Win64 Qt5.12
4040
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
4141
VSPATH: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\SDK\ScopeCppSDK\VC\bin
@@ -45,7 +45,7 @@ environment:
4545
CMAKE_ARGS:
4646
exiv2url: https://github.com/10110111/exiv2/releases/download/ver0.28.0-final/exiv2-0.28.0-2017msvc64.zip
4747
exiv2baseName: exiv2-0.28.0-2017msvc64
48-
scConverterEnabled: 0
48+
scConverterEnabled: false
4949
- BUILD_NAME: Win64 Qt5.15
5050
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
5151
VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
@@ -55,23 +55,23 @@ environment:
5555
CMAKE_ARGS: -A x64
5656
exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
5757
exiv2baseName: exiv2-0.28.0-2019msvc64
58-
scConverterEnabled: 0
58+
scConverterEnabled: false
5959
- BUILD_NAME: Arm64 Qt6.5
6060
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
6161
VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
6262
QT_VERSION_MAJOR: 6
6363
QT_BASEDIR: C:\Qt\6.5\msvc2019_arm64
6464
CMAKE_GENERATOR: Visual Studio 17 2022
6565
CMAKE_ARGS: -A ARM64 -DSTELLARIUM_BUILD_ARM64=ON -DQT_HOST_PATH=C:\Qt\6.5\msvc2019_64 -DQt6LinguistTools_DIR=C:\Qt\6.5\msvc2019_64\lib\cmake\Qt6LinguistTools -DENABLE_QTWEBENGINE=OFF
66-
scConverterEnabled: 0
66+
scConverterEnabled: false
6767
# - BUILD_NAME: Arm64 Qt6.8
6868
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
6969
# VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
7070
# QT_VERSION_MAJOR: 6
7171
# QT_BASEDIR: C:\Qt\6.8\msvc2022_arm64
7272
# CMAKE_GENERATOR: Visual Studio 17 2022
7373
# CMAKE_ARGS: -A ARM64 -DSTELLARIUM_BUILD_ARM64=ON -DQT_HOST_PATH=C:\Qt\6.8\msvc2022_64 -DQt6LinguistTools_DIR=C:\Qt\6.8\msvc2022_64\lib\cmake\Qt6LinguistTools -DENABLE_QTWEBENGINE=OFF
74-
# scConverterEnabled: 0
74+
# scConverterEnabled: false
7575
before_build:
7676
- set DEBUG_WINDEPLOYQT=false
7777
- set PUBLISH_BINARY=false
@@ -80,6 +80,7 @@ before_build:
8080
- set USE_EXT_LIBSSL=false
8181
- set USE_EXT_LIBGLES=false
8282
- set SIGNING=false
83+
- set INSTALL_CONVERTER=false
8384
- set INSTALL_CONVERTER_DEPS=false
8485
- set INNSPATH=C:\Program Files (x86)\Inno Setup 5;C:\Program Files (x86)\Inno Setup 6
8586
- set PATH=%VSPATH%;%QT_BASEDIR%\bin;c:\%exiv2baseName%\bin;%INNSPATH%;c:\%gettextBaseName%\bin;c:\%tidyBaseName%\bin;c:\skyculture-converter;%PATH%
@@ -99,10 +100,8 @@ before_build:
99100
- ps: if($env:PUBLISH_BINARY -eq "true" -and $env:BUILD_NAME.contains('Win')) { $env:USE_MESA = 'true' }
100101
- ps: if($env:APPVEYOR_REPO_BRANCH -eq "stellarium-stable" -and $env:QT_VERSION_MAJOR -eq "6") { $env:SIGNING = 'true' }
101102
- ps: if($env:APPVEYOR_REPO_BRANCH -eq "stellarium-oldstable" -and $env:QT_VERSION_MAJOR -eq "5") { $env:SIGNING = 'true' }
102-
- ps: if($env:CMAKE_ARGS -imatch 'SCM_SHOULD_ENABLE_CONVERTER=ON' -or $env:scConverterEnabled -eq "1") { $env:INSTALL_CONVERTER_DEPS = 'true' }
103-
- ps: 'Write-Host "INSTALL_CONVERTER_DEPS is set to: $env:INSTALL_CONVERTER_DEPS"'
104-
- ps: 'Write-Host "CMAKE_ARGS contains: $env:CMAKE_ARGS"'
105-
- ps: 'Write-Host "scConverterEnabled is: $env:scConverterEnabled"'
103+
- ps: if($env:CMAKE_ARGS.contains('SCM_SHOULD_ENABLE_CONVERTER') -or $env:scConverterEnabled -eq 'true') { $env:INSTALL_CONVERTER_DEPS = 'true' }
104+
- ps: if($env:PUBLISH_BINARY -eq 'true' -and $env:scConverterEnabled -eq 'true') { $env:INSTALL_CONVERTER = 'true' }
106105

107106
- ps: if($env:exiv2url -ne $null) { appveyor DownloadFile $env:exiv2url -FileName c:\$env:exiv2baseName.zip }
108107
- ps: if($env:exiv2url -ne $null) { 7z e c:\$env:exiv2baseName.zip -spf -oc:\ }
@@ -126,12 +125,12 @@ before_build:
126125
- if [%INSTALL_CONVERTER_DEPS%]==[true] ps: appveyor DownloadFile $env:tidyURL -FileName c:\$env:tidyBaseName.zip
127126
- if [%INSTALL_CONVERTER_DEPS%]==[true] ps: 7z e c:\$env:tidyBaseName.zip -spf -oc:\
128127

129-
- if [1]==[%scConverterEnabled%] git clone -q --depth=2 https://github.com/Stellarium/stellarium-skyculture-converter c:\skyculture-converter
130-
- if [1]==[%scConverterEnabled%] mkdir c:\skyculture-converter\build
131-
- if [1]==[%scConverterEnabled%] cd c:\skyculture-converter\build
132-
- if [1]==[%scConverterEnabled%] git show --summary
133-
- if [1]==[%scConverterEnabled%] cmake -DCMAKE_PREFIX_PATH=c:\%gettextBaseName%;c:\%tidyBaseName% -DCMAKE_INSTALL_PREFIX=c:\sc-converter -G "%CMAKE_GENERATOR%" %CMAKE_ARGS% ..
134-
- if [1]==[%scConverterEnabled%] if [%PUBLISH_BINARY%]==[true] cmake --build . --config %configuration% --target install -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
128+
- if [%INSTALL_CONVERTER%]==[true] git clone -q --depth=2 https://github.com/Stellarium/stellarium-skyculture-converter c:\skyculture-converter
129+
- if [%INSTALL_CONVERTER%]==[true] mkdir c:\skyculture-converter\build
130+
- if [%INSTALL_CONVERTER%]==[true] cd c:\skyculture-converter\build
131+
- if [%INSTALL_CONVERTER%]==[true] git show --summary
132+
- if [%INSTALL_CONVERTER%]==[true] cmake -DCMAKE_PREFIX_PATH=c:\%gettextBaseName%;c:\%tidyBaseName% -DCMAKE_INSTALL_PREFIX=c:\sc-converter -G "%CMAKE_GENERATOR%" %CMAKE_ARGS% ..
133+
- if [%INSTALL_CONVERTER%]==[true] cmake --build . --config %configuration% --target install -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
135134

136135
- cd c:\stellarium
137136
- mkdir build && cd build

0 commit comments

Comments
 (0)