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

Minor change to the 'Install Path' validation for Zig 0.4.0 release. #28

Merged
merged 1 commit into from
Apr 12, 2019
Merged

Minor change to the 'Install Path' validation for Zig 0.4.0 release. #28

merged 1 commit into from
Apr 12, 2019

Conversation

alecnunn
Copy link
Contributor

The Zig 0.4.0 release removed the "index.zig" file from what I can tell. This minor change should fix at least this issue.

Copy link
Owner

@ice1000 ice1000 left a comment

Choose a reason for hiding this comment

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

LGTM

@ice1000 ice1000 merged commit fa41261 into ice1000:master Apr 12, 2019
@ice1000 ice1000 self-assigned this Apr 12, 2019
@ice1000 ice1000 added the sdk SDK related label Apr 12, 2019
@ice1000
Copy link
Owner

ice1000 commented Apr 12, 2019

Thanks!

@@ -37,7 +37,7 @@ fun findOrCreate(baseDir: VirtualFile, dir: String, module: Module) =
fun validateZigExe(exePath: String) = Files.isExecutable(Paths.get(exePath))

// https://github.com/zig-lang/zig/blob/7350181a4a778f9d03186e5123beffdf80f58606/src/main.cpp#L140-L173
fun validateZigLib(libPath: String) = Files.isReadable(Paths.get(libPath, "lib", "zig", "std", "index.zig"))
fun validateZigLib(libPath: String) = Files.isReadable(Paths.get(libPath, "lib", "zig", "std", "zig.zig"))

Choose a reason for hiding this comment

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

the new path is lib/zig/std/std.zig

Copy link
Owner

@ice1000 ice1000 Apr 12, 2019

Choose a reason for hiding this comment

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

So I can check all of these files and return true if one of them exists?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sdk SDK related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants