Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
249 commits
Select commit Hold shift + click to select a range
6977849
Adjusted for MinGW compilation (#20)
RivinHD May 1, 2025
c632288
Merge branch 'Stellarium:master' into master
Integer-Ctrl May 4, 2025
9f8435b
feat: create SCM plugin and add line drawing tool (#14)(#15) (#21)
xLPMG May 7, 2025
3a12db3
Merge branch 'Stellarium:master' into master
Integer-Ctrl May 12, 2025
9abd2ac
Create bundle-build.yml
RivinHD May 19, 2025
dcc1df4
Update bundle-build.yml
RivinHD May 19, 2025
1db3fb8
Update bundle-build.yml
RivinHD May 19, 2025
ea0df59
Update bundle-build.yml
RivinHD May 19, 2025
0c15ca0
Update bundle-build.yml
RivinHD May 19, 2025
4ae6344
Stellarium bundeling Action (#46)
RivinHD May 24, 2025
19fbfcc
feat: Basic workflow implementation (#33)
xLPMG Jun 2, 2025
9818306
Merge branch 'master' into sync-fork
RivinHD Jun 2, 2025
e9f9036
Sync from master
RivinHD Jun 2, 2025
f15dcbb
chore: split bundle steps
RivinHD Jun 2, 2025
e676fbc
feat: Implemented erase
RivinHD Jun 3, 2025
1c06dae
chore: cleanup
RivinHD Jun 4, 2025
b2ed260
chore: cleanup
RivinHD Jun 4, 2025
03d7f62
chore: qt5 support
RivinHD Jun 4, 2025
212fb9c
feat: added support for immediate connect on search
RivinHD Jun 6, 2025
8992765
implement basic features
xLPMG Jun 6, 2025
5dcd476
misc
xLPMG Jun 6, 2025
359601d
improve layout of SkyCultureDialog
xLPMG Jun 6, 2025
3f9f1d7
fix minor UI details
xLPMG Jun 6, 2025
a494cf7
fix code doc and that the selected tool was not reset after saving co…
xLPMG Jun 6, 2025
c8ae3c4
fix: missing end point on findNearestPoint
RivinHD Jun 7, 2025
ba2a88c
fix: pr suggestions
Integer-Ctrl Jun 7, 2025
dafc56a
Merge pull request #67 from Integer-Ctrl/56-feature-eraser-for-stick-…
Integer-Ctrl Jun 7, 2025
a0124e1
fix removal of constellations didnt remove all drawn lines
xLPMG Jun 7, 2025
4aafc3e
fix: typo
RivinHD Jun 7, 2025
585cde6
Merge pull request #71 from Integer-Ctrl/52-displayConstellationsInSC…
Integer-Ctrl Jun 7, 2025
fe3cd1d
Merge branch 'master' into 68-add-better-support-for-line-drawing-wit…
Integer-Ctrl Jun 7, 2025
2eb247c
fix: paranthese
Integer-Ctrl Jun 7, 2025
91e1272
Merge pull request #70 from Integer-Ctrl/68-add-better-support-for-li…
Integer-Ctrl Jun 7, 2025
c30a366
feat: Show warning if a constellation with the chosen ID already exis…
xLPMG Jun 9, 2025
ea5d55b
feat: changed colors of labels and lines to stellarium defaults (#60)
ZeyxRew Jun 12, 2025
c214cad
implement license selection
xLPMG Jun 13, 2025
cb37afa
add classification selector
xLPMG Jun 13, 2025
2bf1df2
declare MetaType
xLPMG Jun 13, 2025
1d6a74a
some code doc
xLPMG Jun 14, 2025
d681749
fix: suggestions
Integer-Ctrl Jun 15, 2025
b613d4d
Merge pull request #80 from Integer-Ctrl/78-license-selection
Integer-Ctrl Jun 15, 2025
8e229bd
implement
xLPMG Jun 15, 2025
1568077
spelling mistake
xLPMG Jun 15, 2025
2b66bcb
ui: form
Integer-Ctrl Jun 15, 2025
202b9e6
Merge pull request #83 from Integer-Ctrl/82-export-constellations
Integer-Ctrl Jun 15, 2025
cd30fdf
feat: description form + force user to complete form + save as markdown
Integer-Ctrl Jun 15, 2025
4bb4b5a
Merge branch 'master' into 9-upload-text-and-images-for-description-md
Integer-Ctrl Jun 15, 2025
485f643
fix: pr suggestions
Integer-Ctrl Jun 15, 2025
48b983f
chore: merge
Integer-Ctrl Jun 15, 2025
facc6f8
Merge pull request #84 from Integer-Ctrl/9-upload-text-and-images-for…
Integer-Ctrl Jun 16, 2025
1397b83
76 bug save a constellation results in fatal assert on windows (#86)
RivinHD Jun 16, 2025
7dd05c1
fix: use nameColor in drawNames (#96)
xLPMG Jun 17, 2025
689785c
Merge remote-tracking branch 'upstream/master'
xLPMG Jun 17, 2025
6e4c9fa
Merge branch 'Stellarium:master' into master
MherMnatsakanyan03 Jun 20, 2025
b40431a
Added SkyCultureConverter as extra button
MherMnatsakanyan03 Jun 20, 2025
e68e9b3
Add gettextpo and libtidy to windows build
MherMnatsakanyan03 Jun 20, 2025
cbffaf4
Pin vcpkg to a specific commit for reproducible builds
MherMnatsakanyan03 Jun 20, 2025
a440c3d
Update vcpkg commit ID
MherMnatsakanyan03 Jun 20, 2025
ecaecac
reverted ci changes since scc was updated
MherMnatsakanyan03 Jun 21, 2025
f2152d8
Update vcpkg setup with specific commit ID and adjust dependencies
MherMnatsakanyan03 Jun 21, 2025
faf5603
attempt to fix bundle-build
MherMnatsakanyan03 Jun 21, 2025
9c8d68d
Update bundle-build workflow to specify vcpkg commit ID and remove un…
MherMnatsakanyan03 Jun 21, 2025
3bac9bd
Update vcpkg install command to specify architecture for dependencies
MherMnatsakanyan03 Jun 21, 2025
0143a7b
Update bundle-build workflow to use x64 architecture for dependencies…
MherMnatsakanyan03 Jun 21, 2025
6671929
tried to fix toolchain path
MherMnatsakanyan03 Jun 21, 2025
9a25dc9
ignore scm because dependencie installation doesnt work
MherMnatsakanyan03 Jun 21, 2025
77d158e
only disable the scc instead of scm entirely
MherMnatsakanyan03 Jun 21, 2025
8fdece1
added dependencies for scc
MherMnatsakanyan03 Jun 21, 2025
b663af5
added geolocation and rearranged tabs for sky sulture dialog
ZeyxRew Jun 21, 2025
64f321e
chore: added license, re-ordered
Integer-Ctrl Jun 21, 2025
074a1bd
feat: add export dialog for reminder (#7) (#99)
xLPMG Jun 21, 2025
3950979
Merge pull request #102 from Integer-Ctrl/89-add-geolocation-tab
ZeyxRew Jun 21, 2025
75d08de
40 ux implementation to upload and anchor images to sky cultures (#98)
RivinHD Jun 22, 2025
cd8aa67
Merge pull request #103 from Integer-Ctrl/9-description
Integer-Ctrl Jun 22, 2025
58056ac
temporary buggy mess
MherMnatsakanyan03 Jun 22, 2025
1b134a4
Fixed buggy dialog window
MherMnatsakanyan03 Jun 22, 2025
8d4e911
Merge branch 'master' into SkyCultureConverter20062025
MherMnatsakanyan03 Jun 22, 2025
b784c7c
feat: output sky culture as JSON string (#104)
xLPMG Jun 22, 2025
5c6ec65
(possible) Bugxfixes https://github.com/Integer-Ctrl/stellarium/pull/…
MherMnatsakanyan03 Jun 22, 2025
29130fc
disable rich text in text edit blocks
xLPMG Jun 22, 2025
1654c09
Merge pull request #105 from Integer-Ctrl/disable-rich-text
Integer-Ctrl Jun 23, 2025
bf0ffcc
various improvements and bugfixes
MherMnatsakanyan03 Jun 24, 2025
7ed86ef
chore: order of drawing buttons (#106)
Integer-Ctrl Jun 25, 2025
673328b
sync
Integer-Ctrl Jun 25, 2025
3cdeca6
remove dummy class for build errors when "SCM_SHOULD_ENABLE_CONVERTER…
MherMnatsakanyan03 Jun 25, 2025
90539e9
add help widget for comment
ZeyxRew Jun 25, 2025
016c61b
beginning of documentation
ZeyxRew Jun 25, 2025
a33307f
feat: hiding, aborting maker process (#100, #108)
Integer-Ctrl Jun 26, 2025
5ae1506
feat: save and exit scm (#107)
Integer-Ctrl Jun 26, 2025
53894ba
chores: clean up
Integer-Ctrl Jun 26, 2025
5ec69b7
destructor cancles the thread
MherMnatsakanyan03 Jun 26, 2025
dc1bfa2
fix error of wrong cancellation
MherMnatsakanyan03 Jun 26, 2025
6bfdc36
fix: toggle bottom bar scm button
Integer-Ctrl Jun 26, 2025
918b4c4
add tooltip for undo button
ZeyxRew Jun 28, 2025
3f5a78b
Update README.md
ZeyxRew Jun 28, 2025
cc452b8
edit icon location
ZeyxRew Jun 28, 2025
6e2d896
5 feature upload and anchor images (#111)
RivinHD Jun 28, 2025
dd574cb
add homebrew library paths on MacOs
xLPMG Jun 28, 2025
4e32ed4
Merge pull request #101 from Integer-Ctrl/SkyCultureConverter20062025
MherMnatsakanyan03 Jun 28, 2025
4a6d862
fix: pr suggestions
Integer-Ctrl Jun 29, 2025
a875fcf
Merge branch 'master' into 93-improve-UI
ZeyxRew Jun 29, 2025
a68ce56
add license, skyCulture export, other editing
ZeyxRew Jun 29, 2025
fc628f4
Add conversion of skyculture
ZeyxRew Jun 29, 2025
f39835d
Merge branch 'master' into ux-ui-window-flow
Integer-Ctrl Jun 29, 2025
1ae52f9
fix: typo
Integer-Ctrl Jun 29, 2025
729ba2c
Merge pull request #113 from Integer-Ctrl/ux-ui-window-flow
Integer-Ctrl Jun 29, 2025
2074c8f
Merge pull request #112 from Integer-Ctrl/93-improve-UI
Integer-Ctrl Jun 29, 2025
37b5cc8
feat: export sc data to folder (#116)
xLPMG Jun 30, 2025
5654ec5
enhanced the converter paragraph
MherMnatsakanyan03 Jun 30, 2025
6f2de15
fix: window flow
Integer-Ctrl Jul 1, 2025
ad4eea4
feat: save cmakelists with sky culture (#120)
xLPMG Jul 1, 2025
b5e475b
Update plugins/SkyCultureMaker/src/gui/ScmStartDialog.cpp
Integer-Ctrl Jul 2, 2025
acd986f
Merge pull request #123 from Integer-Ctrl/122-converter-window
Integer-Ctrl Jul 2, 2025
a21ffa6
Added fallback directory (#121)
RivinHD Jul 4, 2025
7ec7ffd
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
9bb1b8e
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
09861eb
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
9475248
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
5142511
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
0ad01ae
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
c34a963
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
d859615
add explanation for anchoring images and delete file structure
ZeyxRew Jul 6, 2025
fdcb160
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
f7d522b
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
bf986b9
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
ed1d437
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
1ae9bda
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
3aa03be
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
2079878
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
b2eeb0d
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 6, 2025
ed46f46
Update README.md
ZeyxRew Jul 6, 2025
469ccec
Merge branch '95-plugin-description-README.md' of https://github.com/…
ZeyxRew Jul 6, 2025
07e9975
Update README.md
ZeyxRew Jul 6, 2025
7cc2888
chore: copyright and clean up debug statements (#126)
xLPMG Jul 6, 2025
5e6a166
Merge remote-tracking branch 'upstream/master' into sync-upstream
xLPMG Jul 6, 2025
5a7bb44
Merge pull request #127 from Integer-Ctrl/sync-upstream
xLPMG Jul 6, 2025
76d59a0
Update SkyCultureMaker.cpp
xLPMG Jul 6, 2025
ec63969
Update plugins/SkyCultureMaker/README.md
ZeyxRew Jul 9, 2025
191d319
Merge pull request #115 from Integer-Ctrl/95-plugin-description-READM…
ZeyxRew Jul 9, 2025
31b8a7c
feat: edit constellations (#128)
xLPMG Aug 14, 2025
1dc153e
Merge remote-tracking branch 'upstream/master' into sync-upstream
xLPMG Aug 14, 2025
7c79d8f
Merge pull request #130 from Integer-Ctrl/sync-upstream
xLPMG Aug 14, 2025
25286c9
Delete .github/workflows/bundle-build.yml
Integer-Ctrl Aug 14, 2025
d883a4c
fix: issues from PR review (#131)
xLPMG Aug 21, 2025
a2554b7
Fixed appveyor
RivinHD Aug 22, 2025
c187d28
fix: save sky culture to data dir and log location (#133)
xLPMG Aug 29, 2025
5a75120
feat: let user choose directory for sky culture export (#134)
xLPMG Aug 29, 2025
15741d2
Merge remote-tracking branch 'upstream/master' into sync-upstream
xLPMG Aug 29, 2025
58c1e88
chore: sync upstream (#135)
xLPMG Aug 29, 2025
574b0f8
Revert "chore: sync upstream (#135)"
xLPMG Aug 29, 2025
d04bfd1
chore: sync upstream (no squash)
xLPMG Aug 29, 2025
dbf6d4c
Added tidy-devel package for FreeBSD
alex-w Aug 29, 2025
099585c
Fix library name for FreeBSD CI
alex-w Aug 29, 2025
48037a6
Update ci.yml
alex-w Aug 29, 2025
4c75e44
Update .appveyor.yml
alex-w Aug 29, 2025
d70d920
Update .appveyor.yml
alex-w Aug 29, 2025
116f948
fix: Ci for FreeBSD Qt6 (#137)
xLPMG Aug 29, 2025
43819e9
ci: clean up macos paths
xLPMG Aug 29, 2025
955c0a1
ci: remove unnecessary libtidy parameter in freebsd build
xLPMG Aug 29, 2025
2f7bfdb
Attempt to fix compilation in MSVC2017
alex-w Aug 30, 2025
9952847
Lets use bstrSmartPointer
alex-w Aug 30, 2025
2f36b65
Update CMakeLists.txt
alex-w Aug 30, 2025
09be0ba
Oops… revert changes
alex-w Aug 30, 2025
2cdd967
Update StelSystemInfo.cpp
alex-w Aug 30, 2025
7f764cb
I hope this is fixed compilation with old MSVC
alex-w Aug 30, 2025
d6193dd
Fix typos
alex-w Aug 30, 2025
68d3659
ci: disable converter on windows arm builds due to missing libraries
xLPMG Aug 30, 2025
0f19b84
ci: improve converter disabling
xLPMG Aug 30, 2025
a376351
appveyor: add gettext and tidy to PATH
xLPMG Aug 30, 2025
31bda7b
remove windeployqt6
xLPMG Aug 30, 2025
822749d
remove extra space
xLPMG Aug 30, 2025
4fd63c5
feat: improve Sky Culture Overview UX (#140)
xLPMG Aug 31, 2025
00258fe
feat: small UI improvements
xLPMG Aug 31, 2025
9cc6a37
change converter lib name
xLPMG Sep 1, 2025
e0a837c
Update .appveyor.yml
alex-w Sep 1, 2025
238dbaa
CPMAddPackage -> CPMFindPackage
alex-w Sep 1, 2025
b81e6a4
disable converter by default
xLPMG Sep 1, 2025
bd21662
disable converter in Qt5 builds
xLPMG Sep 1, 2025
da34f25
remove converter dependencies from codeql analysis
xLPMG Sep 1, 2025
062182a
move converter parameter to cmake args
xLPMG Sep 1, 2025
bd7755f
appveyor: conditional converter dependency installation
xLPMG Sep 1, 2025
4f9a572
Merge pull request #141 from Integer-Ctrl/default-disable-converter
xLPMG Sep 1, 2025
f80719c
[skip ci] remove extra space
xLPMG Sep 1, 2025
88899e5
appveyor: change INSTALL_CONVERTER_DEPS args detection
xLPMG Sep 1, 2025
3a7de80
add debugging log
xLPMG Sep 2, 2025
cd23c25
fix nested mappings
xLPMG Sep 2, 2025
cf5e2d9
appveyor: attempt to fix the building of Qt6-based package
alex-w Sep 2, 2025
c52e4f4
Merge branch 'master' into master
alex-w Sep 2, 2025
ed757f7
appveyor: fix rules
alex-w Sep 2, 2025
9364c63
appveyor: fix statement block
alex-w Sep 2, 2025
57130a3
appveyor: add hook
alex-w Sep 2, 2025
6070f9c
lets try to speed up...
alex-w Sep 2, 2025
e87d3a2
fix stupid errors
alex-w Sep 2, 2025
b11927c
fix typos
alex-w Sep 2, 2025
aac17a4
appveyor: enable shallow_clone option
alex-w Sep 2, 2025
2c914e2
[publish] test appveyor publishing path + copy dependencies only duri…
xLPMG Sep 2, 2025
a7ca2c7
[publish] another attempt
alex-w Sep 3, 2025
b535da3
[skip ci] improve code doc
xLPMG Sep 3, 2025
3324563
remove font information from ui files
xLPMG Sep 3, 2025
c8fe399
[skip ci] remove extra tab
xLPMG Sep 3, 2025
2b52742
[skip ci] more ui improvements
xLPMG Sep 3, 2025
16cf92f
dynamic font adjustment
RivinHD Sep 3, 2025
32d51a3
remove qtmetamacros header
xLPMG Sep 3, 2025
be2214a
remove incomplete classification type
xLPMG Sep 3, 2025
f96c88d
[skip ci] fix typo in description placeholder
xLPMG Sep 3, 2025
6ba4d53
Merge pull request #142 from Integer-Ctrl/pr-review
xLPMG Sep 3, 2025
c75dcea
Cosmetic fix for GUI
alex-w Sep 4, 2025
1a85ae4
Fix l10n support
alex-w Sep 4, 2025
68c8663
[skip ci] move colon
xLPMG Sep 4, 2025
f056bf6
add tool help text for MacOS
xLPMG Sep 4, 2025
922d8b1
use export naming instead of save
xLPMG Sep 4, 2025
2abc052
only snap to stars and not other objects
xLPMG Sep 4, 2025
de11d03
add drawing modes
xLPMG Sep 4, 2025
f224a53
fix ci
xLPMG Sep 4, 2025
9d1fadd
code improvements [skip ci]
xLPMG Sep 4, 2025
6c49298
add button for drawing dark constellations
xLPMG Sep 4, 2025
6a82a83
set to normal constellation by default
xLPMG Sep 4, 2025
dae67e6
actually save dark constellations..
xLPMG Sep 4, 2025
90fb9de
fix snapping behavior
xLPMG Sep 4, 2025
3dfa570
Merge remote-tracking branch 'upstream/master'
xLPMG Sep 5, 2025
4bed379
consistent formatting in ci
xLPMG Sep 5, 2025
ae7dfc1
Merge branch 'master' into rework-snapping-and-dark-constellations
xLPMG Sep 5, 2025
21c28a6
add code doc to DrawingMode
xLPMG Sep 5, 2025
3100c74
[skip ci] Create CHANGELOG.md
xLPMG Sep 5, 2025
2e2cd97
get line colors from settings
xLPMG Sep 6, 2025
16cc4f1
[skip ci] update debug logging
xLPMG Sep 6, 2025
00138f6
rename StarPoint to SkyPoint
xLPMG Sep 6, 2025
3175c1f
only allow search and connect for normal constellations
xLPMG Sep 6, 2025
13612b4
refactor visibility function
xLPMG Sep 6, 2025
dda6175
[skip ci] formatting
xLPMG Sep 6, 2025
0b54599
make the id a fixed parameter of constellations
xLPMG Sep 6, 2025
acec871
use longlong instead of int for HIP ids
xLPMG Sep 7, 2025
087453f
make sure that drawing is cleared when switching type
xLPMG Sep 7, 2025
593100a
reset tool when switching drawing mode
xLPMG Sep 7, 2025
206c2b3
Merge pull request #143 from Integer-Ctrl/rework-snapping-and-dark-co…
xLPMG Sep 7, 2025
2f68b9c
Cosmetic fixes
alex-w Sep 8, 2025
39f308b
ui: remove html block
xLPMG Sep 9, 2025
e5bca9d
make some parts of the SC description optional
xLPMG Sep 11, 2025
7cf1682
Merge remote-tracking branch 'upstream/master' into sync-upstream
xLPMG Sep 12, 2025
bfeba42
chore: sync upstream [skip ci]
xLPMG Sep 12, 2025
2bfe294
use latest unarr commit to fix Qt6 build
xLPMG Sep 12, 2025
0edfe09
Merge branch 'master' into master
alex-w Sep 14, 2025
77cb318
2-3-4: ui improvements 1
xLPMG Sep 16, 2025
9174d24
remove info labels
xLPMG Sep 16, 2025
aec2b24
5-6: classification and license
xLPMG Sep 16, 2025
ae45ae0
other ui improvements
xLPMG Sep 16, 2025
868e0d2
fix constellation dialog ui
xLPMG Sep 16, 2025
787885c
merge: UI fixes for PR review
xLPMG Sep 16, 2025
7cb9b0f
remove html from constellationDialog ui
xLPMG Sep 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 45 additions & 35 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ configuration: Release
clone_folder: c:\stellarium
# set clone depth
clone_depth: 5
shallow_clone: true
# Do not build feature branch with open Pull Requests
skip_branch_with_pr: true
# Do not build on tags
Expand Down Expand Up @@ -32,20 +33,20 @@ environment:
QT_VERSION_MAJOR: 6
QT_BASEDIR: C:\Qt\6.8\msvc2022_64
CMAKE_GENERATOR: Visual Studio 17 2022
CMAKE_ARGS: -A x64
CMAKE_ARGS: -A x64 -DSCM_SHOULD_ENABLE_CONVERTER=ON
exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
exiv2baseName: exiv2-0.28.0-2019msvc64
scConverterEnabled: 1
scConverterEnabled: true
- BUILD_NAME: Win64 Qt5.12
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VSPATH: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\SDK\ScopeCppSDK\VC\bin
QT_VERSION_MAJOR: 5
QT_BASEDIR: C:\Qt\5.12\msvc2017_64
CMAKE_GENERATOR: Visual Studio 15 2017 Win64
CMAKE_ARGS:
CMAKE_ARGS: --
exiv2url: https://github.com/10110111/exiv2/releases/download/ver0.28.0-final/exiv2-0.28.0-2017msvc64.zip
exiv2baseName: exiv2-0.28.0-2017msvc64
scConverterEnabled: 0
scConverterEnabled: false
# - BUILD_NAME: Win64 Qt5.15
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
# VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
Expand All @@ -55,23 +56,23 @@ environment:
# CMAKE_ARGS: -A x64
# exiv2url: https://github.com/Exiv2/exiv2/releases/download/v0.28.0/exiv2-0.28.0-2019msvc64.zip
# exiv2baseName: exiv2-0.28.0-2019msvc64
# scConverterEnabled: 0
# scConverterEnabled: false
- BUILD_NAME: Arm64 Qt6.5
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
QT_VERSION_MAJOR: 6
QT_BASEDIR: C:\Qt\6.5\msvc2019_arm64
CMAKE_GENERATOR: Visual Studio 17 2022
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
scConverterEnabled: 0
scConverterEnabled: false
# - BUILD_NAME: Arm64 Qt6.8
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
# VSPATH: C:\Program Files\Microsoft Visual Studio\2022\Community\SDK\ScopeCppSDK\vc15\VC\bin
# QT_VERSION_MAJOR: 6
# QT_BASEDIR: C:\Qt\6.8\msvc2022_arm64
# CMAKE_GENERATOR: Visual Studio 17 2022
# 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
# scConverterEnabled: 0
# scConverterEnabled: false
before_build:
- set DEBUG_WINDEPLOYQT=false
- set PUBLISH_BINARY=false
Expand All @@ -80,8 +81,10 @@ before_build:
- set USE_EXT_LIBSSL=false
- set USE_EXT_LIBGLES=false
- set SIGNING=false
- set INSTALL_CONVERTER=false
- set INSTALL_CONVERTER_DEPS=false
- set INNSPATH=C:\Program Files (x86)\Inno Setup 5;C:\Program Files (x86)\Inno Setup 6
- set PATH=%VSPATH%;%QT_BASEDIR%\bin;c:\%exiv2baseName%\bin;%INNSPATH%;%PATH%
- set PATH=%VSPATH%;%QT_BASEDIR%\bin;c:\%exiv2baseName%\bin;%INNSPATH%;c:\%gettextBaseName%\bin;c:\%tidyBaseName%\bin;c:\skyculture-converter;%PATH%

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

- ps: if($env:exiv2url -ne $null) { appveyor DownloadFile $env:exiv2url -FileName c:\$env:exiv2baseName.zip }
- ps: if($env:exiv2url -ne $null) { 7z e c:\$env:exiv2baseName.zip -spf -oc:\ }
Expand All @@ -106,32 +111,32 @@ before_build:
- 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
- if [%USE_EXT_WEBENGINE%]==[true] 7z e c:\qtwebengine.7z -spf -o%QT_BASEDIR%

- ps: if ($env:scConverterEnabled) { appveyor DownloadFile $env:gettextURL -FileName c:\$env:gettextBaseName.zip }
- ps: if ($env:scConverterEnabled) { 7z e c:\$env:gettextBaseName.zip -spf -oc:\$env:gettextBaseName }
- ps: if ($env:scConverterEnabled) { mkdir c:\$env:gettextBaseName\include }
- ps: if ($env:scConverterEnabled) { appveyor DownloadFile $env:gettextSrcURL -FileName c:\$env:gettextSrcBaseName.tar.xz }
- ps: if ($env:scConverterEnabled) { 7z e c:\$env:gettextSrcBaseName.tar.xz -spf -oc:\ }
- ps: if ($env:scConverterEnabled) { 7z e c:\$env:gettextSrcBaseName.tar -spf -oc:\ }
- 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 }
- ps: if ($env:scConverterEnabled) { echo EXPORTS > libgettextpo.def }
- ps: if ($env:scConverterEnabled) { cp c:\$env:gettextBaseName\bin\libgettextpo-0.dll c:\$env:gettextBaseName\bin\libgettextpo.dll }
- ps: if ($env:scConverterEnabled) { (dumpbin /EXPORTS c:\$env:gettextBaseName\bin\libgettextpo.dll) -match "^.*\b(po_.*)$" -replace "^.*\b(po_.*)$","`$1" >> libgettextpo.def }
- ps: if ($env:scConverterEnabled) { lib /def:libgettextpo.def /out:c:\$env:gettextBaseName\lib\libgettextpo.lib }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { appveyor DownloadFile $env:gettextURL -FileName c:\$env:gettextBaseName.zip }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:gettextBaseName.zip -spf -oc:\$env:gettextBaseName }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { mkdir c:\$env:gettextBaseName\include }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { appveyor DownloadFile $env:gettextSrcURL -FileName c:\$env:gettextSrcBaseName.tar.xz }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:gettextSrcBaseName.tar.xz -spf -oc:\ }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { 7z e c:\$env:gettextSrcBaseName.tar -spf -oc:\ }
- 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 }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { echo EXPORTS > libgettextpo.def }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { cp c:\$env:gettextBaseName\bin\libgettextpo-0.dll c:\$env:gettextBaseName\bin\libgettextpo.dll }
- 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 }
- ps: if($env:INSTALL_CONVERTER_DEPS -eq "true") { lib /def:libgettextpo.def /out:c:\$env:gettextBaseName\lib\libgettextpo.lib }

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

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

- cd c:\stellarium
- mkdir build && cd build
- 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% ..
- 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% ..
- 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% ..
- 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% ..

build:
project: c:\stellarium\build\Stellarium.sln
Expand All @@ -145,12 +150,17 @@ after_test:
- if [%PUBLISH_BINARY%]==[true] cmake --build c:\stellarium\build\ --config %configuration% --target install
- if [%DEBUG_WINDEPLOYQT%]==[true] cd c:\stellarium\build\
- if [%DEBUG_WINDEPLOYQT%]==[true] for %%i in (windeployqt.*) do appveyor PushArtifact %%i
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%gettextBaseName%\bin\libgettextpo-0.dll c:\stellarium-package\bin\libgettextpo.dll
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%gettextBaseName%\bin\libintl-8.dll c:\stellarium-package\bin\
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%gettextBaseName%\bin\libiconv-2.dll c:\stellarium-package\bin\
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\%tidyBaseName%\bin\tidy.dll c:\stellarium-package\bin\
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\sc-converter\skyculture-converter.exe c:\stellarium-package\bin\
- if [%PUBLISH_BINARY%]==[true] if [%scConverterEnabled%]==[1] copy c:\sc-converter\Qt6Xml.dll c:\stellarium-package\qtstuff\
- 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
- if [%INSTALL_CONVERTER%]==[true] 7z e c:\sc-converter.zip -aoa -oc:\sc-converter
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\lib*.dll c:\stellarium-package\bin\
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\tidy.dll c:\stellarium-package\bin\
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\skyculture-converter.exe c:\stellarium-package\bin\
- if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\Qt6Xml.dll c:\stellarium-package\qtstuff\
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%gettextBaseName%\bin\libgettextpo-0.dll c:\stellarium-package\bin\libgettextpo.dll
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%gettextBaseName%\bin\libintl-8.dll c:\stellarium-package\bin\
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%gettextBaseName%\bin\libiconv-2.dll c:\stellarium-package\bin\
# - if [%INSTALL_CONVERTER%]==[true] copy c:\%tidyBaseName%\bin\tidy.dll c:\stellarium-package\bin\
# - if [%INSTALL_CONVERTER%]==[true] copy c:\sc-converter\Qt6Xml.dll c:\stellarium-package\qtstuff\
- 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
- if [%USE_EXT_LIBGLES%]==[true] 7z e c:\stellarium\build\libGLES.zip -aoa -oc:\stellarium-package\qtstuff
- 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
Expand Down
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ CheckOptions:
- key: modernize-use-default-member-init.UseAssignment
value: '1'
...

60 changes: 46 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ jobs:
run: |
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DENABLE_TESTING=On \
"${{ github.workspace }}"

- name: Compile
working-directory: build
Expand Down Expand Up @@ -68,7 +71,7 @@ jobs:
qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev \
libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin \
libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev \
libgps-dev libmd4c-dev libmd4c-html0-dev
libgps-dev libmd4c-dev libmd4c-html0-dev cmake gettext libgettextpo-dev libtidy-dev libunarr-dev

- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -78,7 +81,11 @@ jobs:
run: |
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DENABLE_TESTING=On \
-DSCM_SHOULD_ENABLE_CONVERTER=On \
"${{ github.workspace }}"

- name: Compile
working-directory: build
Expand Down Expand Up @@ -123,7 +130,7 @@ jobs:
-DUSE_PLUGIN_LENSDISTORTIONESTIMATOR=Off -DUSE_PLUGIN_NEBULATEXTURES=Off -DUSE_PLUGIN_NAVSTARS=Off -DUSE_PLUGIN_NOVAE=Off -DUSE_PLUGIN_OBSERVABILITY=Off \
-DUSE_PLUGIN_OCULARS=Off -DUSE_PLUGIN_ONLINEQUERIES=Off -DUSE_PLUGIN_POINTERCOORDINATES=Off -DUSE_PLUGIN_PULSARS=Off -DUSE_PLUGIN_QUASARS=Off \
-DUSE_PLUGIN_REMOTECONTROL=Off -DUSE_PLUGIN_REMOTESYNC=Off -DUSE_PLUGIN_SATELLITES=Off -DUSE_PLUGIN_SCENERY3D=Off -DUSE_PLUGIN_SOLARSYSTEMEDITOR=Off \
-DUSE_PLUGIN_SUPERNOVAE=Off -DUSE_PLUGIN_TELESCOPECONTROL=Off -DUSE_PLUGIN_TEXTUSERINTERFACE=Off \
-DUSE_PLUGIN_SUPERNOVAE=Off -DUSE_PLUGIN_TELESCOPECONTROL=Off -DUSE_PLUGIN_TEXTUSERINTERFACE=Off -DUSE_PLUGIN_SKYCULTUREMAKER=Off \
"${{ github.workspace }}"

- name: Compile
Expand Down Expand Up @@ -160,10 +167,14 @@ jobs:
- name: Configure CMake
shell: bash
run: |
export PATH="/opt/homebrew/opt/qt@5/bin:/usr/local/opt/qt@5/bin:$PATH"
export PATH="/usr/local/opt/qt@5/bin:$PATH"
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DENABLE_TESTING=On \
"${{ github.workspace }}"

- name: Compile
working-directory: build
Expand Down Expand Up @@ -191,7 +202,7 @@ jobs:
run: |
# brew update
# brew upgrade
brew install qt@6 nlopt exiv2
brew install qt@6 nlopt exiv2 tidy-html5

- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -202,7 +213,12 @@ jobs:
export PATH="/usr/local/opt/qt@6/bin:$PATH"
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DSCM_SHOULD_ENABLE_CONVERTER=On \
-DENABLE_TESTING=On \
"${{ github.workspace }}"

- name: Compile
working-directory: build
Expand Down Expand Up @@ -233,18 +249,23 @@ jobs:
run: |
# brew update
# brew upgrade
brew install qt@6 nlopt exiv2
brew install qt@6 nlopt exiv2 tidy-html5

- name: Checkout repository
uses: actions/checkout@v4

- name: Configure CMake
shell: bash
run: |
export PATH="/usr/local/opt/qt@6/bin:$PATH"
export PATH="/opt/homebrew/opt/qt@6/bin:$PATH"
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On ${{ github.workspace }}
cmake -DCMAKE_PREFIX_PATH="/opt/homebrew" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DENABLE_TESTING=On \
-DSCM_SHOULD_ENABLE_CONVERTER=On \
"${{ github.workspace }}"

- name: Compile
working-directory: build
Expand Down Expand Up @@ -285,7 +306,11 @@ jobs:
export DISPLAY=:0
mkdir builds
cd builds
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On -DENABLE_QT6=Off "${{ github.workspace }}"
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DENABLE_TESTING=On \
-DENABLE_QT6=Off \
"${{ github.workspace }}"
make -j3
Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
sleep 3
Expand Down Expand Up @@ -313,14 +338,21 @@ jobs:
# When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
copyback: false
prepare: |
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6 tidy-html5

run: |
set -e -x
export DISPLAY=:0
export CMAKE_PREFIX_PATH="/usr/local:$CMAKE_PREFIX_PATH"
mkdir builds
cd builds
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSTELLARIUM_RELEASE_BUILD=Off \
-DENABLE_TESTING=On \
-DLIBTIDY_LIBRARY="/usr/local/lib/libtidy5.so" \
-DSCM_SHOULD_ENABLE_CONVERTER=On \
"${{ github.workspace }}"
make -j3
Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
sleep 3
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@ qrc_*.cpp
.kdev4
# Ignore Eclipse project files
.project
# Ignore vscode project files
.vscode
Loading
Loading