Skip to content

Commit 6def06f

Browse files
authored
Prepping for 3.7.1 (#578)
1 parent 86d8b42 commit 6def06f

File tree

4 files changed

+73
-20
lines changed

4 files changed

+73
-20
lines changed

README.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,49 @@ If you need to regenerate the help documentation, see the [README-docs.txt](READ
5656

5757

5858
# Release notes
59+
## Release notes for 3.7.1
60+
61+
Bugs addressed in this release:
62+
63+
* [#443](../../issues/443) Dark Mode doesn't show status bar on Mac
64+
* [#462](../../issues/462) PDF printing of Continuities seems wrong
65+
* [#497](../../issues/497) Animate ctor should be explicit
66+
* [#518](../../issues/518) Animation looks wrong
67+
* [#540](../../issues/540) Current 3.7.1 does not run
68+
* [#542](../../issues/542) crashes when going to last sheet of animation in RAINBOW show
69+
* [#544](../../issues/544) Print Continuity text is not showing up
70+
71+
Other changes:
72+
73+
* [#492](../../issues/492) calchart_cmd should have an option for dumping json
74+
* [#494](../../issues/494) Refine the calchart_cmd for dump_continuity_text
75+
* [#498](../../issues/498) remove GetAnimation
76+
* [#500](../../issues/500) Add JSON tests to sanity tests
77+
* [#502](../../issues/502) remove get animation sheet iterator
78+
* [#504](../../issues/504) Make Animation::NextBeat private
79+
* [#506](../../issues/506) remove index from AnimateInfo
80+
* [#510](../../issues/510) Switch the underlying Coord system to int32
81+
* [#512](../../issues/512) Animation commands should contain the position, not the beat
82+
* [#514](../../issues/514) Make Animation part of the Show, with access through the show
83+
* [#521](../../issues/521) Degree should have special constructors for common directions
84+
* [#526](../../issues/526) We should have a sanity test for ps output
85+
* [#528](../../issues/528) Clean up postscript files to be more value like
86+
* [#530](../../issues/530) Tidy up CalChartShow.h
87+
* [#532](../../issues/532) tidy up CalChartFileFormat
88+
* [#534](../../issues/534) remove unused Token from Continuity parsing
89+
* [#536](../../issues/536) Change the animation objects to be within the Animate namespace
90+
* [#538](../../issues/538) Remove unused cont symbol from animate errors
91+
* [#546](../../issues/546) Change behavior of show generation so endPosition and nextPosition in animation are the same
92+
* [#547](../../issues/547) Add some basic profiling to calband_cmd
93+
* [#550](../../issues/550) Make animation compilation an operation of two pairs of sheets
94+
* [#552](../../issues/552) Move GenerateModeDrawCommands from CalChartDrawing to core/Mode
95+
* [#554](../../issues/554) Move General printing over to PrintContUseNewDraw
96+
* [#557](../../issues/557) Move Config into DrawPoints
97+
* [#563](../../issues/563) Print doesn't show continuity correct
98+
* [#565](../../issues/565) Move more drawing into Show and ShowDoc
99+
* [#567](../../issues/567) Remove GetCurrentSheet() from CalChartView
100+
* [#570](../../issues/570) Tidy up CalChart View
101+
59102
## Release notes for 3.7.0
60103

61104
Bugs addressed in this release:

RELEASE_INSTRUCTIONS.md

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,56 @@ Checklist
1313

1414
CalChart uses CMake and Github actions to automate the release process. When you push a tag for the repository, github will build and package the release.
1515

16-
The current calchart version is 3.7.0. In all commands below, substitute that number for `$CCVER` (meaning when you read `$CCVER`, type 3.7.0)
16+
The current calchart version is 3.7.1. In all commands below, substitute that number for `$CCVER` (meaning when you read `$CCVER`, type 3.7.1)
1717

18-
1. Prebuild the project to make sure its working
18+
1. Create a git branch to prep the changes: `git diff dev/prep_$CCVER`
1919

20-
2. Update LATEST_RELEASE_NOTES.md with all the changes (it will get posted to the release by our CI bot)
20+
2. Prebuild the project to make sure its working
2121

22-
3. copy LATEST_RELEASE_NOTES.md into master README.md for the master record via this command:
22+
3. Update LATEST_RELEASE_NOTES.md with all the changes (it will get posted to the release by our CI bot)
23+
24+
4. copy LATEST_RELEASE_NOTES.md into master README.md for the master record via this command:
2325

2426
```
2527
awk '//; /^# Release notes/{while(getline<"LATEST_RELEASE_NOTES.md"){print}}' README.md > tmp && mv tmp README.md
2628
```
2729

28-
4. Tag the depot
30+
5. Merge the branch into main
31+
32+
6. Tag the depot
2933

3034
```
31-
$ git tag -a v3.7.0 -m "calchart-3.7.0"
32-
$ git push origin v3.7.0
35+
$ git tag -a v3.7.1 -m "calchart-3.7.1"
36+
$ git push origin v3.7.1
3337
```
3438

3539
This should trigger the github action, which should publish release notes in Draft form.
3640

37-
5. Once the Release information looks good, Press the Publish Release button.
41+
7. Once the Release information looks good, Press the Publish Release button.
42+
43+
8. Download the Release artifacts to your machine.
44+
45+
9. Go to the sourceforge page at http://sourceforge.net/projects/calchart. You'll need to be logged in as Administrator to modify the files.
46+
47+
10. Go to Project Admin -> File Manager
3848

39-
6. Download the Release artifacts to your machine.
49+
11. Make a new directory for this version (click on the * next to root)
4050

41-
7. Go to the sourceforge page at http://sourceforge.net/projects/calchart. You'll need to be logged in as Administrator to modify the files.
51+
12. Upload the `README.md` to the new folder. Click on `README.md` and edit the file details to signify it's a release notes.
4252

43-
8. Go to Project Admin -> File Manager
53+
13. Upload the `CalChart-$CCVER.dmg` to the folder. Click on dmg and edit the file details to signify its platform is Mac (OS X) and set the release_notes for the file.
4454

45-
9. Make a new directory for this version (click on the * next to root)
55+
14. Repeat for `Install-CalChart-$CCVER.exe`. Click on zip and edit the file details to signify its platform is Windows and set the release_notes for the file.
4656

47-
10. Upload the `README.md` to the new folder. Click on `README.md` and edit the file details to signify it's a release notes.
57+
15. Update https://github.com/calband/calchart/milestone by closing the shipped milestone and starting the next one.
4858

49-
11. Upload the `CalChart-$CCVER.dmg` to the folder. Click on dmg and edit the file details to signify its platform is Mac (OS X) and set the release_notes for the file.
59+
16. Create a git branch to pre-prep the next version: `git diff dev/pre_prep_$CCVER+1`
5060

51-
12. Repeat for `Install-CalChart-$CCVER.exe`. Click on zip and edit the file details to signify its platform is Windows and set the release_notes for the file.
61+
17. Clear out LATEST_RELEASE_NOTES.md for next development effort. Update $CCVER+1 in RELEASE_INSTRUCTIONS.md.
5262

53-
13. Update https://github.com/calband/calchart/milestone by closing the shipped milestone and starting the next one.
63+
18. Merge dev/pre_prep
5464

55-
14. Notify the world about the new version of CalChart.
65+
19. Notify the world about the new version of CalChart.
5666

57-
15. Have a cookie.
67+
20. Have a cookie.
5868

src/CalChartFrame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ wxString CalChartFrame::BeatStatusText() const
12911291

12921292
wxString CalChartFrame::PointStatusText() const
12931293
{
1294-
auto show = GetShow();
1294+
auto const* show = GetShow();
12951295
wxString result;
12961296
auto sl = show->GetSelectionList();
12971297
result << show->GetSelectionList().size() << " of "

src/core/CalChartSheet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ auto Sheet::FindMarcher(Coord where, Coord::units searchBound, unsigned ref) con
518518
return i;
519519
}
520520
}
521-
return -1;
521+
return std::nullopt;
522522
}
523523

524524
SelectionList Sheet::MakeSelectPointsBySymbol(SYMBOL_TYPE i) const

0 commit comments

Comments
 (0)