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

Change: [Makefile] replace custom git-detection with 'findversion.sh' #25

Merged
merged 1 commit into from Feb 23, 2020

Conversation

TrueBrain
Copy link
Member

'findversion.sh' is a script from the OpenTTD repository. This means
OpenGFX now acts the same as OpenTTD in terms of version, filename,
etc.

'findversion.sh' is a script from the OpenTTD repository. This means
OpenGFX now acts the same as OpenTTD in terms of version, filename,
etc.
@frosch123
Copy link
Member

How is the version stored for bundles now?
In some places the diff uses a "Makefile.vcs", in others it uses ".ottdrev".

@TrueBrain
Copy link
Member Author

TrueBrain commented Feb 23, 2020

How is the version stored for bundles now?
In some places the diff uses a "Makefile.vcs", in others it uses ".ottdrev".

As per comment:

# Have a file which, if modified, triggers recompiling targets that use these
# variables.
Makefile.vcs: FORCE

In other words:

  • Makefile.vcs is only used for recompiling
  • version is now controlled in the same way as OpenTTD for source-tarballs: via .ottdrev (through findversion.sh)

Normal bundles of course have neither Makefile.vcs (never had) nor .ottdrev; only for source-tarballs ofc :)

@TrueBrain TrueBrain merged commit 4ad3227 into OpenTTD:master Feb 23, 2020
@TrueBrain TrueBrain deleted the findversion branch February 23, 2020 11:52
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

2 participants