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: [CMake] Copy AI/GS compatibility files to build dir #8906

Merged
merged 1 commit into from Apr 2, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Mar 28, 2021

Fixes #8618

Motivation / Problem

When running openttd from build dir, Script API compatibility files are not found.
And for MSVC project build it's worse as lang files are not found either 😉.

Description

compat_*.nut files are now copied to build dir when compiling.
I also changed MSVC working dir to build dir (instead of bin).
Since build dir now contains the exact list of compat files, I decided to use them for install instead of bin dirs (which may contain extra stuff in an unclean checkout).

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@LordAro
Copy link
Member

LordAro commented Mar 28, 2021

Can this simplify the installer targets at all? I've not looked, but they must be already copying the script files, is that still necessary?

Also, does this want backporting? I'd assume so

@glx22
Copy link
Contributor Author

glx22 commented Mar 30, 2021

I don't understand the question about installer targets.
And backporting is optional I'd say.

Copy link
Member

@michicc michicc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to do what it says, as far as I can tell.

@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Apr 2, 2021
@michicc michicc merged commit 799eb31 into OpenTTD:master Apr 2, 2021
@glx22 glx22 deleted the fix_8618 branch April 2, 2021 12:06
LordAro pushed a commit to LordAro/OpenTTD that referenced this pull request Apr 17, 2021
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Apr 18, 2021
glx22 added a commit to glx22/OpenTTD that referenced this pull request Apr 19, 2021
glx22 added a commit to glx22/OpenTTD that referenced this pull request Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Script API compatibility files are not found
3 participants