This repository has been archived by the owner on Mar 25, 2024. It is now read-only.
Detect and keep CGO dependencies from subfolders. #52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for this, @karalabe! We've had issues with native code imports, so this contribution is very welcome. I'll have just a couple minor comments. |
imikushin
suggested changes
Oct 24, 2016
| // Extract any includes from the preamble | ||
| for _, line := range strings.Split(cg.Text(), "\n") { | ||
| if line = strings.TrimSpace(line); strings.HasPrefix(line, "#include \"") { | ||
| if path := filepath.Dir(line[10 : len(line)-1]); path != "." { |
There was a problem hiding this comment.
path var collides with an imported package name. Wanna rename to includePath?
| if line = strings.TrimSpace(line); strings.HasPrefix(line, "#include \"") { | ||
| if path := filepath.Dir(line[10 : len(line)-1]); path != "." { | ||
| if _, err := os.Stat(filepath.Join(pkgPath, path)); !os.IsNotExist(err) { | ||
| sch <- filepath.Join(pkg, path) |
There was a problem hiding this comment.
Wanna send filepath.Clean(filepath.Join(pkg, path)) instead?
|
Fixed :) PTAL |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes an issue that's haunting all the dependency managers out there (e.g. tools/godep#422), namely that they only take into consideration Go dependencies, and not CGO ones. This results in build failures for all projects where C files are in subfolders (i.e. most of them), as the dependency manager deletes all those folders thinking they are unused.
This fixes the issue by doing a second round of import scanning, where instead of looking for Go import statements, the code looks for CGO preambles and extracts any
#include "path"-s where the path points to an existing folder. This will result in any folders references by CGO code to be kept, instead of trashed.