Skip to content

Commit 0ae56e4

Browse files
Integer-CtrlRivinHDxLPMGZeyxRewMherMnatsakanyan03
authored
New Plugin: SkyCultureMaker (#4454)
(issue number refer to internal project issues) * Adjusted for MinGW compilation (#20) * Added windows mingw to ci * feat: create SCM plugin and add line drawing tool (#14)(#15) (#21) * Create bundle-build.yml * Stellarium bundling Action (#46) * Switched to bundle MSVC * Switched to powershell & vcpkg not required * feat: added support for immediate connect on search * feat: Show warning if a constellation with the chosen ID already exists in the SC (#69) #73 * feat: description form + force user to complete form + save as markdown * Add gettextpo and libtidy to windows build * Pin vcpkg to a specific commit for reproducible builds * feat: add export dialog for reminder (#7) (#99) * 40 ux implementation to upload and anchor images to sky cultures (#98) * feat: output sky culture as JSON string (#104) * feat: hiding, aborting maker process (#100, #108) * feat: save and exit scm (#107) * feat: export sc data to folder (#116) * feat: save cmakelists with sky culture (#120) * Added fallback directory (#121) * feat: edit constellations (#128) * feat: let user choose directory for sky culture export (#134) * Added tidy-devel package for FreeBSD * feat: improve Sky Culture Overview UX (#140) * feat: small UI improvements * (several more details invalidated by squash) * Doc: plugins/SkyCultureMaker/README.md --------- Co-authored-by: Vincent Gerlach <58261670+RivinHD@users.noreply.github.com> Co-authored-by: Luca-Philipp Grumbach <xxlpmghdxx@gmail.com> Co-authored-by: Fabian Hofer <57919013+Integer-Ctrl@users.noreply.github.com> Co-authored-by: Richard Hofmann <117768526+ZeyxRew@users.noreply.github.com> Co-authored-by: Mher Mnatsakanyan <116891912+MherMnatsakanyan03@users.noreply.github.com> Co-authored-by: Mher Mnatsakanyan <mher.mnatsakanyan03@gmail.com> Co-authored-by: Alexander V. Wolf <alex.v.wolf@gmail.com> Co-authored-by: Alexander V. Wolf <aw@altspu.ru>
1 parent 16227b1 commit 0ae56e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+13538
-53
lines changed

.appveyor.yml

Lines changed: 45 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ configuration: Release
55
clone_folder: c:\stellarium
66
# set clone depth
77
clone_depth: 5
8+
shallow_clone: true
89
# Do not build feature branch with open Pull Requests
910
skip_branch_with_pr: true
1011
# Do not build on tags
@@ -32,20 +33,20 @@ environment:
3233
QT_VERSION_MAJOR: 6
3334
QT_BASEDIR: C:\Qt\6.8\msvc2022_64
3435
CMAKE_GENERATOR: Visual Studio 17 2022
35-
CMAKE_ARGS: -A x64
36+
CMAKE_ARGS: -A x64 -DSCM_SHOULD_ENABLE_CONVERTER=ON
3637
exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
3738
exiv2baseName: exiv2-0.28.0-2019msvc64
38-
scConverterEnabled: 1
39+
scConverterEnabled: true
3940
- BUILD_NAME: Win64 Qt5.12
4041
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
4142
VSPATH: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\SDK\ScopeCppSDK\VC\bin
4243
QT_VERSION_MAJOR: 5
4344
QT_BASEDIR: C:\Qt\5.12\msvc2017_64
4445
CMAKE_GENERATOR: Visual Studio 15 2017 Win64
45-
CMAKE_ARGS:
46+
CMAKE_ARGS: --
4647
exiv2url: https://github.com/10110111/exiv2/releases/download/ver0.28.0-final/exiv2-0.28.0-2017msvc64.zip
4748
exiv2baseName: exiv2-0.28.0-2017msvc64
48-
scConverterEnabled: 0
49+
scConverterEnabled: false
4950
# - BUILD_NAME: Win64 Qt5.15
5051
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
5152
# VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
@@ -55,23 +56,23 @@ environment:
5556
# CMAKE_ARGS: -A x64
5657
# exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
5758
# exiv2baseName: exiv2-0.28.0-2019msvc64
58-
# scConverterEnabled: 0
59+
# scConverterEnabled: false
5960
- BUILD_NAME: Arm64 Qt6.5
6061
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
6162
VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
6263
QT_VERSION_MAJOR: 6
6364
QT_BASEDIR: C:\Qt\6.5\msvc2019_arm64
6465
CMAKE_GENERATOR: Visual Studio 17 2022
6566
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
67+
scConverterEnabled: false
6768
# - BUILD_NAME: Arm64 Qt6.8
6869
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
6970
# VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
7071
# QT_VERSION_MAJOR: 6
7172
# QT_BASEDIR: C:\Qt\6.8\msvc2022_arm64
7273
# CMAKE_GENERATOR: Visual Studio 17 2022
7374
# 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
75+
# scConverterEnabled: false
7576
before_build:
7677
- set DEBUG_WINDEPLOYQT=false
7778
- set PUBLISH_BINARY=false
@@ -80,8 +81,10 @@ before_build:
8081
- set USE_EXT_LIBSSL=false
8182
- set USE_EXT_LIBGLES=false
8283
- set SIGNING=false
84+
- set INSTALL_CONVERTER=false
85+
- set INSTALL_CONVERTER_DEPS=false
8386
- set INNSPATH=C:\Program Files (x86)\Inno Setup 5;C:\Program Files (x86)\Inno Setup 6
84-
- set PATH=%VSPATH%;%QT_BASEDIR%\bin;c:\%exiv2baseName%\bin;%INNSPATH%;%PATH%
87+
- set PATH=%VSPATH%;%QT_BASEDIR%\bin;c:\%exiv2baseName%\bin;%INNSPATH%;c:\%gettextBaseName%\bin;c:\%tidyBaseName%\bin;c:\skyculture-converter;%PATH%
8588

8689
- ps: if($env:QT_BASEDIR.contains('_64') -or $env:QT_BASEDIR.contains('arm64')) { $env:BITS=64 } else { $env:BITS=32 }
8790
- ps: if($env:QT_BASEDIR.contains('_64')) { $env:PKGARCH="x64" } else { $env:PKGARCH="x86" }
@@ -98,6 +101,8 @@ before_build:
98101
- ps: if($env:PUBLISH_BINARY -eq "true" -and $env:BUILD_NAME.contains('Win')) { $env:USE_MESA = 'true' }
99102
- ps: if($env:APPVEYOR_REPO_BRANCH -eq "stellarium-stable" -and $env:QT_VERSION_MAJOR -eq "6") { $env:SIGNING = 'true' }
100103
- ps: if($env:APPVEYOR_REPO_BRANCH -eq "stellarium-oldstable" -and $env:QT_VERSION_MAJOR -eq "5") { $env:SIGNING = 'true' }
104+
- ps: if($env:CMAKE_ARGS.contains('SCM_SHOULD_ENABLE_CONVERTER')) { $env:INSTALL_CONVERTER_DEPS = 'true' }
105+
- ps: if($env:PUBLISH_BINARY -eq 'true' -and $env:scConverterEnabled -eq 'true') { $env:INSTALL_CONVERTER = 'true' }
101106

102107
- ps: if($env:exiv2url -ne $null) { appveyor DownloadFile $env:exiv2url -FileName c:\$env:exiv2baseName.zip }
103108
- ps: if($env:exiv2url -ne $null) { 7z e c:\$env:exiv2baseName.zip -spf -oc:\ }
@@ -106,32 +111,32 @@ before_build:
106111
- if [%USE_EXT_WEBENGINE%]==[true] appveyor DownloadFile https://github.com/Stellarium/stellarium-data/releases/download/qt-5.6/6.8.1-0-202411221529qtwebengine-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z -FileName c:\qtwebengine.7z
107112
- if [%USE_EXT_WEBENGINE%]==[true] 7z e c:\qtwebengine.7z -spf -o%QT_BASEDIR%
108113

109-
- ps: if ($env:scConverterEnabled) { appveyor DownloadFile $env:gettextURL -FileName c:\$env:gettextBaseName.zip }
110-
- ps: if ($env:scConverterEnabled) { 7z e c:\$env:gettextBaseName.zip -spf -oc:\$env:gettextBaseName }
111-
- ps: if ($env:scConverterEnabled) { mkdir c:\$env:gettextBaseName\include }
112-
- ps: if ($env:scConverterEnabled) { appveyor DownloadFile $env:gettextSrcURL -FileName c:\$env:gettextSrcBaseName.tar.xz }
113-
- ps: if ($env:scConverterEnabled) { 7z e c:\$env:gettextSrcBaseName.tar.xz -spf -oc:\ }
114-
- ps: if ($env:scConverterEnabled) { 7z e c:\$env:gettextSrcBaseName.tar -spf -oc:\ }
115-
- ps: if ($env:scConverterEnabled) { (cat c:\$env:gettextSrcBaseName\gettext-tools\libgettextpo\gettext-po.in.h) -replace "extern ([^()]*);","extern __declspec (dllimport) `$1;" > c:\$env:gettextBaseName\include\gettext-po.h }
116-
- ps: if ($env:scConverterEnabled) { echo EXPORTS > libgettextpo.def }
117-
- ps: if ($env:scConverterEnabled) { cp c:\$env:gettextBaseName\bin\libgettextpo-0.dll c:\$env:gettextBaseName\bin\libgettextpo.dll }
118-
- ps: if ($env:scConverterEnabled) { (dumpbin /EXPORTS c:\$env:gettextBaseName\bin\libgettextpo.dll) -match "^.*\b(po_.*)$" -replace "^.*\b(po_.*)$","`$1" >> libgettextpo.def }
119-
- ps: if ($env:scConverterEnabled) { lib /def:libgettextpo.def /out:c:\$env:gettextBaseName\lib\libgettextpo.lib }
114+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { appveyor DownloadFile $env:gettextURL -FileName c:\$env:gettextBaseName.zip }
115+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:gettextBaseName.zip -spf -oc:\$env:gettextBaseName }
116+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { mkdir c:\$env:gettextBaseName\include }
117+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { appveyor DownloadFile $env:gettextSrcURL -FileName c:\$env:gettextSrcBaseName.tar.xz }
118+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:gettextSrcBaseName.tar.xz -spf -oc:\ }
119+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:gettextSrcBaseName.tar -spf -oc:\ }
120+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { (cat c:\$env:gettextSrcBaseName\gettext-tools\libgettextpo\gettext-po.in.h) -replace "extern ([^()]*);","extern __declspec (dllimport) `$1;" > c:\$env:gettextBaseName\include\gettext-po.h }
121+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { echo EXPORTS > libgettextpo.def }
122+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { cp c:\$env:gettextBaseName\bin\libgettextpo-0.dll c:\$env:gettextBaseName\bin\libgettextpo.dll }
123+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { (dumpbin /EXPORTS c:\$env:gettextBaseName\bin\libgettextpo.dll) -match "^.*\b(po_.*)$" -replace "^.*\b(po_.*)$","`$1" >> libgettextpo.def }
124+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { lib /def:libgettextpo.def /out:c:\$env:gettextBaseName\lib\libgettextpo.lib }
120125

121-
- ps: appveyor DownloadFile $env:tidyURL -FileName c:\$env:tidyBaseName.zip
122-
- ps: 7z e c:\$env:tidyBaseName.zip -spf -oc:\
126+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { appveyor DownloadFile $env:tidyURL -FileName c:\$env:tidyBaseName.zip }
127+
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:tidyBaseName.zip -spf -oc:\ }
123128

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

131136
- cd c:\stellarium
132137
- mkdir build && cd build
133-
- if [%PUBLISH_BINARY%]==[true] cmake -DCMAKE_PREFIX_PATH=c:\%exiv2baseName% -DENABLE_MEDIA=On -DENABLE_PODIR=Off -DCMAKE_INSTALL_PREFIX=c:\stellarium-package -G "%CMAKE_GENERATOR%" %CMAKE_ARGS% ..
134-
- if [%PUBLISH_BINARY%]==[false] cmake -DCMAKE_PREFIX_PATH=c:\%exiv2baseName% -DENABLE_MEDIA=On -DENABLE_TESTING=On -DENABLE_NLS=Off -DCMAKE_INSTALL_PREFIX=c:\stellarium-package -G "%CMAKE_GENERATOR%" %CMAKE_ARGS% ..
138+
- if [%PUBLISH_BINARY%]==[true] cmake -DCMAKE_PREFIX_PATH=c:\%exiv2baseName%;c:\%gettextBaseName%;c:\%tidyBaseName% -DENABLE_MEDIA=On -DENABLE_PODIR=Off -DCMAKE_INSTALL_PREFIX=c:\stellarium-package -G "%CMAKE_GENERATOR%" %CMAKE_ARGS% ..
139+
- if [%PUBLISH_BINARY%]==[false] cmake -DCMAKE_PREFIX_PATH=c:\%exiv2baseName%;c:\%gettextBaseName%;c:\%tidyBaseName% -DENABLE_MEDIA=On -DENABLE_TESTING=On -DENABLE_NLS=Off -DCMAKE_INSTALL_PREFIX=c:\stellarium-package -G "%CMAKE_GENERATOR%" %CMAKE_ARGS% ..
135140

136141
build:
137142
project: c:\stellarium\build\Stellarium.sln
@@ -145,12 +150,17 @@ after_test:
145150
- if [%PUBLISH_BINARY%]==[true] cmake --build c:\stellarium\build\ --config %configuration% --target install
146151
- if [%DEBUG_WINDEPLOYQT%]==[true] cd c:\stellarium\build\
147152
- if [%DEBUG_WINDEPLOYQT%]==[true] for %%i in (windeployqt.*) do appveyor PushArtifact %%i
148-
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%gettextBaseName%\bin\libgettextpo-0.dll c:\stellarium-package\bin\libgettextpo.dll
149-
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%gettextBaseName%\bin\libintl-8.dll c:\stellarium-package\bin\
150-
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%gettextBaseName%\bin\libiconv-2.dll c:\stellarium-package\bin\
151-
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%tidyBaseName%\bin\tidy.dll c:\stellarium-package\bin\
152-
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\sc-converter\skyculture-converter.exe c:\stellarium-package\bin\
153-
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\sc-converter\Qt6Xml.dll c:\stellarium-package\qtstuff\
153+
- if [%INSTALL_CONVERTER%]==[true] appveyor DownloadFile https://github.com/Stellarium/stellarium-skyculture-converter/releases/download/v0.0.1/stellarium-skyculture-converter-0.0.1-win64.zip -FileName c:\sc-converter.zip
154+
- if [%INSTALL_CONVERTER%]==[true] 7z e c:\sc-converter.zip -aoa -oc:\sc-converter
155+
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\lib*.dll c:\stellarium-package\bin\
156+
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\tidy.dll c:\stellarium-package\bin\
157+
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\skyculture-converter.exe c:\stellarium-package\bin\
158+
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\Qt6Xml.dll c:\stellarium-package\qtstuff\
159+
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%gettextBaseName%\bin\libgettextpo-0.dll c:\stellarium-package\bin\libgettextpo.dll
160+
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%gettextBaseName%\bin\libintl-8.dll c:\stellarium-package\bin\
161+
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%gettextBaseName%\bin\libiconv-2.dll c:\stellarium-package\bin\
162+
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%tidyBaseName%\bin\tidy.dll c:\stellarium-package\bin\
163+
# - if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\Qt6Xml.dll c:\stellarium-package\qtstuff\
154164
- if [%USE_EXT_LIBGLES%]==[true] appveyor DownloadFile https://github.com/Stellarium/stellarium-data/releases/download/qt-5.6/libGLES-Win%BITS%.zip -FileName c:\stellarium\build\libGLES.zip
155165
- if [%USE_EXT_LIBGLES%]==[true] 7z e c:\stellarium\build\libGLES.zip -aoa -oc:\stellarium-package\qtstuff
156166
- if [%USE_MESA%]==[true] appveyor DownloadFile https://github.com/Stellarium/stellarium-data/releases/download/mesa-win-20.1.8/opengl32sw-%PKGARCH%.dll -FileName c:\stellarium-package\qtstuff\opengl32sw.dll

.clang-tidy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ CheckOptions:
3434
- key: modernize-use-default-member-init.UseAssignment
3535
value: '1'
3636
...
37-

.github/workflows/ci.yml

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ jobs:
3838
run: |
3939
mkdir -p build
4040
cd build
41-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
41+
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
42+
-DSTELLARIUM_RELEASE_BUILD=Off \
43+
-DENABLE_TESTING=On \
44+
"${{ github.workspace }}"
4245
4346
- name: Compile
4447
working-directory: build
@@ -68,7 +71,7 @@ jobs:
6871
qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev \
6972
libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin \
7073
libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev \
71-
libgps-dev libmd4c-dev libmd4c-html0-dev
74+
libgps-dev libmd4c-dev libmd4c-html0-dev cmake gettext libgettextpo-dev libtidy-dev libunarr-dev
7275
7376
- name: Checkout repository
7477
uses: actions/checkout@v4
@@ -78,7 +81,11 @@ jobs:
7881
run: |
7982
mkdir -p build
8083
cd build
81-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
84+
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
85+
-DSTELLARIUM_RELEASE_BUILD=Off \
86+
-DENABLE_TESTING=On \
87+
-DSCM_SHOULD_ENABLE_CONVERTER=On \
88+
"${{ github.workspace }}"
8289
8390
- name: Compile
8491
working-directory: build
@@ -123,7 +130,7 @@ jobs:
123130
-DUSE_PLUGIN_LENSDISTORTIONESTIMATOR=Off -DUSE_PLUGIN_NEBULATEXTURES=Off -DUSE_PLUGIN_NAVSTARS=Off -DUSE_PLUGIN_NOVAE=Off -DUSE_PLUGIN_OBSERVABILITY=Off \
124131
-DUSE_PLUGIN_OCULARS=Off -DUSE_PLUGIN_ONLINEQUERIES=Off -DUSE_PLUGIN_POINTERCOORDINATES=Off -DUSE_PLUGIN_PULSARS=Off -DUSE_PLUGIN_QUASARS=Off \
125132
-DUSE_PLUGIN_REMOTECONTROL=Off -DUSE_PLUGIN_REMOTESYNC=Off -DUSE_PLUGIN_SATELLITES=Off -DUSE_PLUGIN_SCENERY3D=Off -DUSE_PLUGIN_SOLARSYSTEMEDITOR=Off \
126-
-DUSE_PLUGIN_SUPERNOVAE=Off -DUSE_PLUGIN_TELESCOPECONTROL=Off -DUSE_PLUGIN_TEXTUSERINTERFACE=Off \
133+
-DUSE_PLUGIN_SUPERNOVAE=Off -DUSE_PLUGIN_TELESCOPECONTROL=Off -DUSE_PLUGIN_TEXTUSERINTERFACE=Off -DUSE_PLUGIN_SKYCULTUREMAKER=Off \
127134
"${{ github.workspace }}"
128135
129136
- name: Compile
@@ -160,10 +167,14 @@ jobs:
160167
- name: Configure CMake
161168
shell: bash
162169
run: |
163-
export PATH="/opt/homebrew/opt/qt@5/bin:/usr/local/opt/qt@5/bin:$PATH"
170+
export PATH="/usr/local/opt/qt@5/bin:$PATH"
164171
mkdir -p build
165172
cd build
166-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
173+
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
174+
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
175+
-DSTELLARIUM_RELEASE_BUILD=Off \
176+
-DENABLE_TESTING=On \
177+
"${{ github.workspace }}"
167178
168179
- name: Compile
169180
working-directory: build
@@ -191,7 +202,7 @@ jobs:
191202
run: |
192203
# brew update
193204
# brew upgrade
194-
brew install qt@6 nlopt exiv2
205+
brew install qt@6 nlopt exiv2 tidy-html5
195206
196207
- name: Checkout repository
197208
uses: actions/checkout@v4
@@ -202,7 +213,12 @@ jobs:
202213
export PATH="/usr/local/opt/qt@6/bin:$PATH"
203214
mkdir -p build
204215
cd build
205-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
216+
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
217+
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
218+
-DSTELLARIUM_RELEASE_BUILD=Off \
219+
-DSCM_SHOULD_ENABLE_CONVERTER=On \
220+
-DENABLE_TESTING=On \
221+
"${{ github.workspace }}"
206222
207223
- name: Compile
208224
working-directory: build
@@ -233,18 +249,23 @@ jobs:
233249
run: |
234250
# brew update
235251
# brew upgrade
236-
brew install qt@6 nlopt exiv2
252+
brew install qt@6 nlopt exiv2 tidy-html5
237253
238254
- name: Checkout repository
239255
uses: actions/checkout@v4
240256

241257
- name: Configure CMake
242258
shell: bash
243259
run: |
244-
export PATH="/usr/local/opt/qt@6/bin:$PATH"
260+
export PATH="/opt/homebrew/opt/qt@6/bin:$PATH"
245261
mkdir -p build
246262
cd build
247-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
263+
cmake -DCMAKE_PREFIX_PATH="/opt/homebrew" \
264+
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
265+
-DSTELLARIUM_RELEASE_BUILD=Off \
266+
-DENABLE_TESTING=On \
267+
-DSCM_SHOULD_ENABLE_CONVERTER=On \
268+
"${{ github.workspace }}"
248269
249270
- name: Compile
250271
working-directory: build
@@ -285,7 +306,11 @@ jobs:
285306
export DISPLAY=:0
286307
mkdir builds
287308
cd builds
288-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On -DENABLE_QT6=Off "${{ github.workspace }}"
309+
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
310+
-DSTELLARIUM_RELEASE_BUILD=Off \
311+
-DENABLE_TESTING=On \
312+
-DENABLE_QT6=Off \
313+
"${{ github.workspace }}"
289314
make -j3
290315
Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
291316
sleep 3
@@ -313,14 +338,21 @@ jobs:
313338
# When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
314339
copyback: false
315340
prepare: |
316-
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6
341+
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6 tidy-html5
317342
318343
run: |
319344
set -e -x
320345
export DISPLAY=:0
346+
export CMAKE_PREFIX_PATH="/usr/local:$CMAKE_PREFIX_PATH"
321347
mkdir builds
322348
cd builds
323-
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
349+
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
350+
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
351+
-DSTELLARIUM_RELEASE_BUILD=Off \
352+
-DENABLE_TESTING=On \
353+
-DLIBTIDY_LIBRARY="/usr/local/lib/libtidy5.so" \
354+
-DSCM_SHOULD_ENABLE_CONVERTER=On \
355+
"${{ github.workspace }}"
324356
make -j3
325357
Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
326358
sleep 3

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,5 @@ qrc_*.cpp
7575
.kdev4
7676
# Ignore Eclipse project files
7777
.project
78+
# Ignore vscode project files
79+
.vscode

0 commit comments

Comments
 (0)