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

Updated ModSDK scripts from various old versions to release-20200503 #777

Merged
merged 3 commits into from
Jul 20, 2021

Conversation

penev92
Copy link
Member

@penev92 penev92 commented Jul 19, 2021

This is an attempt to supersede #764 and update the mod to the current release (release-20210321). This will be followed by 3 other PRs another PR that will update things in pieces everything (SDK scripts, engine/custom code and mod rules) from release-20200503 to release-20210321. See commit messages for detailed explanations.
We are starting off small because some of the SDK scripts were quite outdated and this seems like low-hanging fruit.

@pchote
Copy link
Member

pchote commented Jul 19, 2021

These files are no longer used and can also be deleted:

packaging/linux/include/Eluant.dll.config
packaging/linux/include/OpenAL-CS.dll.config
packaging/linux/include/SDL2-CS.dll.config

Copy link
Member

@pchote pchote left a comment

Choose a reason for hiding this comment

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

The SDK has the following files commited with unix line endings, it would be good IMO to change them here to match:

launch-game.cmd
make.ps1
packaging/windows/buildpackage.nsi
utility.cmd

packaging/linux/buildpackage.sh is also missing its end-of-file newline.

@pchote
Copy link
Member

pchote commented Jul 19, 2021

LGTM otherwise; there are some wording changes and a couple of other differences where the SDK is wrong, but if it isn't a goal to directly use the SDK files then that isn't an issue.

Updated `launch-dedicated.cmd` and `launch-dedicated.sh` based on:
  - ModSDK PR 145 - "Update engine for playtest-2020030" ("Add missing launch arguments to launch-dedicated scripts.").
  - ModSDK PR 155 - "Update for playtest-20200418".

Updated `mod.config` based on  ModSDK PR 150 - "Update to playtest-20200329".

Updated `buildpackage.nsi`  based on ModSDK PR 155 - "Update for playtest-20200418".

Removed spurious *.dll.config files from `packaging/linux/include` based on ModSDK PR 117 - "Update scripts to work with the new engine toolchain.".
@penev92 penev92 force-pushed the updateModSdkTo20200503 branch from 62c3e72 to a43d65f Compare July 19, 2021 21:38
@penev92
Copy link
Member Author

penev92 commented Jul 19, 2021

Removed old files

packaging/linux/include/Eluant.dll.config
packaging/linux/include/OpenAL-CS.dll.config
packaging/linux/include/SDL2-CS.dll.config

and fixed indentation error in launch-dedicated.sh.

If you see any other discrepencies between this and https://github.com/OpenRA/OpenRAModSDK/tree/20200503 please be specific, as there are some intentional ones where the RA2 scripts have modified messages. There are also a few points where the ModSDK scripts may need fixing upstream, but since this is an old version of the ModSDK I've just skipped past that.

Also if someone not on Windows can handle the EoL thing (preferably at a later point when we're done because there are also issues inside the custom code) that would be great.

@penev92
Copy link
Member Author

penev92 commented Jul 20, 2021

Added @pchote's commit to fix files for unix standards and added some missing artwork (used placeholders from the ModSDK example).

@abcdefg30 abcdefg30 merged commit b08bd63 into OpenRA:master Jul 20, 2021
@penev92 penev92 deleted the updateModSdkTo20200503 branch July 20, 2021 14:07
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.

3 participants