Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add: Detect stable tags automatically, and set the 'stable' flag in '… #7317

Merged
merged 1 commit into from Mar 3, 2019

Conversation

frosch123
Copy link
Member

@frosch123 frosch123 commented Mar 3, 2019

…_openttd_newgrf_version' accordingly.

In SVN we made changed between branches and tags:

  • Set "stable" flag for stable tags, not for RC and beta.
  • Disable assertions, enable stripping.

This implements the "stable" flag.
It does not do anything about the assertions.

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 3, 2019

Is it possible to do the assertions part automatically with this too?

@glx22
Copy link
Contributor

@glx22 glx22 commented Mar 3, 2019

MSVC project files will still need to be updated to remove the define

@LordAro LordAro added this to the 1.9.0 milestone Mar 3, 2019
@LordAro
Copy link
Member

@LordAro LordAro commented Mar 3, 2019

While not necessarily required, it'd be nice to get this in before branching...

@frosch123
Copy link
Member Author

@frosch123 frosch123 commented Mar 3, 2019

I don't think this can automatically do the assert thingie.
Assertions are handled during configure and in MSVC project files. findversion is in the Makefile phase.

I also think that changing build parameters like assertions/stripping should be set by the compile farm, not by the source code.

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 3, 2019

Yeah, that sounds reasonable.

@PeterN
Copy link
Member

@PeterN PeterN commented Mar 3, 2019

Confirmed working with MSVC.

PeterN
PeterN approved these changes Mar 3, 2019
@frosch123 frosch123 merged commit 39cda89 into OpenTTD:master Mar 3, 2019
8 checks passed
@frosch123 frosch123 deleted the stabletag branch Mar 3, 2019
nielsmh pushed a commit to nielsmh/OpenTTD that referenced this issue Mar 11, 2019
douiwby pushed a commit to douiwby/OpenTTD that referenced this issue Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants