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

Include template files #81

Merged
merged 4 commits into from
Jun 13, 2019
Merged

Conversation

BradLugo
Copy link
Contributor

This PR adds the build script functionality back and changes deploy to use the included files.

Note that the build script doesn't account for different templates, only main templates. Thus, deploy doesn't change its behavior based on the template parameter. I'll open an issue to add functionality to determine more templates if and when this PR is merged.

Closes #71

Changed template.rs to use the included template files using the
code generated by the build script. It should be noted that this
commit removes the awareness of template types.
@BradLugo
Copy link
Contributor Author

This is the first time I've written Rust. I'm open to suggestions and feedback, even if it's simply idiomatic changes.

Copy link
Member

@torkleyy torkleyy left a comment

Choose a reason for hiding this comment

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

Thank you @BradLugo! Looks pretty good, I just have two comments.

build.rs Show resolved Hide resolved
build.rs Outdated Show resolved Hide resolved
@torkleyy
Copy link
Member

https://travis-ci.org/amethyst/tools/jobs/545270691#L635 - liquid doesn't build anymore.

@torkleyy
Copy link
Member

also see rust-lang/rust#60958 (comment)

@BradLugo
Copy link
Contributor Author

Is this blocking the PR? I can look into liquid's repo and see if this is an issue in the current version, and I can open an issue to do a general upgrade for this project, moving to Rust 2018 and upgrading the other packages. I can encompass the liquid build issue along with any other packages that might break the build.

@torkleyy
Copy link
Member

It's failing CI, but I guess I can merge like this.

@torkleyy torkleyy merged commit a7c27dc into amethyst:master Jun 13, 2019
@BradLugo BradLugo deleted the include-templates branch June 17, 2019 16:22
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.

fail to create new game after deleting tool source
2 participants