Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...

Task #656468

S3_1 branching

Added by Marko Lindqvist over 5 years ago. Updated over 1 year ago.

Status:
Closed
Priority:
Normal
Category:
Milestone
Sprint/Milestone:
Start date:
Due date:
2021-02-06
% Done:

0%

Estimated time:

Description

This ticket is for collecting things needed for next branching from master, namely that of S3_1.

TRUNK_3_1-161226.patch (13 KB) TRUNK_3_1-161226.patch Marko Lindqvist, 2017-05-03 10:20 PM
ALPHA_3_0.patch (718 Bytes) ALPHA_3_0.patch Marko Lindqvist, 2017-05-03 10:20 PM
0003-Add-3.1-development-version-savegame-compatibility-m.patch (1.38 KB) 0003-Add-3.1-development-version-savegame-compatibility-m.patch Marko Lindqvist, 2017-05-03 10:23 PM
0001-Prepare-master-for-3.2-development.patch (12.6 KB) 0001-Prepare-master-for-3.2-development.patch master after S3_1 Marko Lindqvist, 2018-09-30 05:04 AM
0002-Add-macro-FREECIV_DEV_SAVE_COMPAT_3_2.patch (1.5 KB) 0002-Add-macro-FREECIV_DEV_SAVE_COMPAT_3_2.patch master after S3_1 Marko Lindqvist, 2018-09-30 05:04 AM
0001-Set-S3_1-to-alpha-mode.patch (987 Bytes) 0001-Set-S3_1-to-alpha-mode.patch S3_1 Marko Lindqvist, 2018-09-30 05:04 AM
0001-Prepare-master-for-3.2-development.patch (12.5 KB) 0001-Prepare-master-for-3.2-development.patch Marko Lindqvist, 2019-06-09 10:56 PM
0001-Set-S3_1-to-alpha-mode.patch (1.24 KB) 0001-Set-S3_1-to-alpha-mode.patch Marko Lindqvist, 2019-06-10 04:05 PM
0001-Set-S3_1-to-alpha-mode.patch (1.24 KB) 0001-Set-S3_1-to-alpha-mode.patch S3_1 Marko Lindqvist, 2021-01-08 11:14 PM
0001-Prepare-master-for-3.2-development.patch (13.7 KB) 0001-Prepare-master-for-3.2-development.patch master after S3_1 Marko Lindqvist, 2021-01-08 11:15 PM
0001-Prepare-master-for-3.2-development.patch (13.7 KB) 0001-Prepare-master-for-3.2-development.patch master after S3_1 Marko Lindqvist, 2021-01-28 08:59 AM
0001-Set-S3_1-to-alpha-mode.patch (1.73 KB) 0001-Set-S3_1-to-alpha-mode.patch S3_1 Marko Lindqvist, 2021-02-03 02:19 PM
0001-Prepare-master-for-3.2-development.patch (13.7 KB) 0001-Prepare-master-for-3.2-development.patch master after S3_1 Marko Lindqvist, 2021-02-03 02:29 PM

Related issues

Related to Freeciv - Feature #804348: CodingStyle: Allowing '//' -comments in C-codeClosed

<a title="Actions" class="icon-only icon-actions js-contextmenu" href="#">Actions</a>
Related to Freeciv - Feature #804349: CodingStyle: Allowing variable declarations middle of the blockClosed

<a title="Actions" class="icon-only icon-actions js-contextmenu" href="#">Actions</a>
Related to Freeciv - Feature #804350: bzip2 deprecation: Prevent saving new bz2-compressed savegamesClosed

<a title="Actions" class="icon-only icon-actions js-contextmenu" href="#">Actions</a>
Related to Freeciv - Feature #820801: FREECIV_DEV_SAVE_COMPAT_3_2Closed

<a title="Actions" class="icon-only icon-actions js-contextmenu" href="#">Actions</a>
Blocked by Freeciv - Task #858829: Refresh "dev" modpacks for current unfrozen master (3.1) data formatsClosed

<a title="Actions" class="icon-only icon-actions js-contextmenu" href="#">Actions</a>

History

#1 Updated by Marko Lindqvist over 5 years ago

Branching instructions in wiki: http://freeciv.wikia.com/wiki/Branching

#2 Updated by Marko Lindqvist over 5 years ago

  • Category set to Milestone

#3 Updated by Marko Lindqvist over 5 years ago

Attaching S3_0 branching patches as a reference.

#6 Updated by Marko Lindqvist about 4 years ago

We made previous branchings 2 years apart. S3_0 was branched 02-Jan-17, but I don't think 02-Jan-19 should be S3_1 branching date.
1) There has been relatively little development on master since S3_0 branching
2) More importantly; previous branch, S3_0, is not yet even gone through d3f nor npf

Likely S3_1 branching time is now early 2020 when S3_0 is expected to enter beta.

#8 Updated by Marko Lindqvist over 3 years ago

  • Related to Feature #804348: CodingStyle: Allowing '//' -comments in C-code added

#9 Updated by Marko Lindqvist over 3 years ago

  • Related to Feature #804349: CodingStyle: Allowing variable declarations middle of the block added

#10 Updated by Marko Lindqvist over 3 years ago

  • Related to Feature #804350: bzip2 deprecation: Prevent saving new bz2-compressed savegames added

#11 Updated by Marko Lindqvist about 3 years ago

It seems that the theme of 3.1 is going to be that of keeping up with outside world development, less that of introducing new gameplay options.
- lua-5.4 support
- gtk4-client
- Qt6-client
- Meson build system

As soon as we have those, we should branch S3_1 relatively soon. We will want to get support for those things released in the form of freeciv-3.1 as soon as possible.

#12 Updated by Marko Lindqvist about 3 years ago

Rebased master patch.

FREECIV_DEV_SAVE_COMPAT_3_2 has been split to -> Feature #820801

#13 Updated by Marko Lindqvist about 3 years ago

#14 Updated by Marko Lindqvist about 3 years ago

New version of S3_1 branch setup patch
- Set version in NEWS

#15 Updated by Marko Lindqvist over 2 years ago

  • Blocked by Task #858829: Refresh "dev" modpacks for current unfrozen master (3.1) data formats added

#16 Updated by Marko Lindqvist almost 2 years ago

Marko Lindqvist wrote:

It seems that the theme of 3.1 is going to be that of keeping up with outside world development, less that of introducing new gameplay options.
- lua-5.4 support

Done

- gtk4-client

No idea when gtk4 will be available, and with slow progress we are lagging behind even the gtk4 development versions. Maybe this won't be S3_1 branching blocker in the and.

- Qt6-client

Our codebase progresses well in parallel with Qt development.
There's beta of Qt6 out, so final release is not far. However, Debian is going to enter major release freeze early 2021. I think it's more likely they don't get Qt6 in before than that they do. Most prominent freeciv developers depend on Debian, so likely Qt6-client work will be finalized only after Qt6 is in Debian. Their freeze has typically lasted around 6 months, so likely they will get Qt6 in, after the freeze, only latter half of 2021. Which makes me conclude that likely freeciv S3_1 branching date is in latter half of 2021 as well.

- Meson build system

Working gtk3.22-client can be built. Not considering this a blocker, but expecting meson stuff to be experimental feature in 3.1 anyway.

#17 Updated by Marko Lindqvist over 1 year ago

- S3_1 patch rebased against current master HEAD
- master-after-S3_1 patch rebased against current master HEAD + Added new 3.1-to-3.2 section to NEWS

#18 Updated by Marko Lindqvist over 1 year ago

Master-after-S3_1 patch rebased against current HEAD

#19 Updated by Marko Lindqvist over 1 year ago

  • Due date set to 2021-02-06

#20 Updated by Marko Lindqvist over 1 year ago

S3_1 patch update

- Rebased against current master HEAD
- Set correct datasubdir in meson builds too

#21 Updated by Marko Lindqvist over 1 year ago

Master-after-S3_1 patch rebased against current master HEAD

#22 Updated by Marko Lindqvist over 1 year ago

  • Status changed from Resolved to Closed

Also available in: Atom PDF