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

Fix: [CMake] Don't include regression AIs in bundles #9068

Merged
merged 1 commit into from Apr 20, 2021

Conversation

@glx22
Copy link
Contributor

@glx22 glx22 commented Apr 19, 2021

Motivation / Problem

In #8906, I though it was a smart move to install script compat files from build dir. But I was forgetting regression AIs were also in this directory. And they ended up in bundles.

Description

This is a revert of the install related changes I made in #8906.
I then excluded any CMakeLists.txt from installation.

I tried another option, using build dir as install source, but the regex to filter AIs subdirs was way harder to read (I'll show it in a suggestion comment).

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')
Copy link
Contributor Author

@glx22 glx22 left a comment

Suggested changes are the other possible solution.

I personally prefer this version as it gets a clean install of ai and game dirs from an unclean checkout.

cmake/InstallAndPackage.cmake Outdated Show resolved Hide resolved
cmake/InstallAndPackage.cmake Outdated Show resolved Hide resolved
@glx22 glx22 changed the title Fix: Install changes from #8906 includes regression AIs in bundles Fix: [CMake] Don't include regression AIs in bundles Apr 20, 2021
@LordAro
Copy link
Member

@LordAro LordAro commented Apr 20, 2021

Which version do you mean by "this version" ? I don't particularly mind either way, though working well from an unclean checkout is a positive

@glx22
Copy link
Contributor Author

@glx22 glx22 commented Apr 20, 2021

"this version" is the install from build dir with a regex to remove regression AI :)

@glx22 glx22 merged commit 8395c65 into OpenTTD:master Apr 20, 2021
12 checks passed
@glx22 glx22 deleted the ai_install branch Apr 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants