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 cache fixes and refactorings #236

Closed
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
66cdcc0
Fix past-end-of-cache handling in includeCache.ExpectFile
matthijskooijman Jun 6, 2017
f69a8cc
Convert IncludesFinderWithRegExp to a normal function
matthijskooijman Jun 6, 2017
be08809
Convert GCCPreprocRunner(ForDiscoveringIncludes) to a normal function
matthijskooijman Jun 6, 2017
85d3624
Refactor path generation for ctags_target_for_gcc_minus_e.cpp
matthijskooijman Jun 6, 2017
a14e0ef
Pass FileToRead to ReadFileAndStoreInContext explicitly
matthijskooijman Jun 6, 2017
73bae11
Remove GCCPreprocSourceSaver
matthijskooijman Jun 6, 2017
b861a84
execSizeRecipe: Fix typo in method name
matthijskooijman Jun 16, 2017
108e65f
Pass types.Context down into compilation helpers
matthijskooijman Jun 16, 2017
0f1baa5
Show the sizer commandline in verbose mode
matthijskooijman Jun 16, 2017
2254d74
Show stdout of preproc commands in verbose mode
matthijskooijman Jun 16, 2017
611f07a
Do not ignore command errors in ExecRecipeCollectStdErr
matthijskooijman Jun 16, 2017
5eb37bc
Let ExecRecipeCollectStdErr return []byte for stderr
matthijskooijman Jun 16, 2017
ca9008e
Improve error handling in include detection
matthijskooijman Jun 16, 2017
60265b5
Merge ExecRecipeCollectStdErr into ExecRecipe
matthijskooijman Jun 16, 2017
31e42b7
Merge some duplicate code into prepareGCCPreprocRecipeProperties
matthijskooijman Jun 16, 2017
b03ecab
Let utils.ExecCommand print the command in verbose mode
matthijskooijman Jun 16, 2017
9abc875
Fix removal of -MMD option when running the preprocessor
matthijskooijman Jun 16, 2017
788cecd
Use utils.ExecCommand for running ctags
matthijskooijman Jun 16, 2017
cc978ec
Pass Context to ObjFileIsUpToDate
matthijskooijman Nov 30, 2017
e92bf65
Let ObjFileIsUpToDate output verbose debug output
matthijskooijman Mar 2, 2017
d2d49e6
ContainerFindIncludes: Add some temporary variables
matthijskooijman Mar 2, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ContainerFindIncludes: Add some temporary variables
This slightly cleans up a function call.

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
matthijskooijman committed May 28, 2018
commit d2d49e625805853e9a531fec95788fbdc39243e0
4 changes: 3 additions & 1 deletion container_find_includes.go
Original file line number Diff line number Diff line change
@@ -292,6 +292,8 @@ func writeCache(cache *includeCache, path string) error {

func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile types.SourceFile) error {
sourcePath := sourceFile.SourcePath(ctx)
depPath := sourceFile.DepfilePath(ctx)
objPath := sourceFile.ObjectPath(ctx)
targetFilePath := utils.NULLFile()

// TODO: This should perhaps also compare against the
@@ -306,7 +308,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
// TODO: This reads the dependency file, but the actual building
// does it again. Should the result be somehow cached? Perhaps
// remove the object file if it is found to be stale?
unchanged, err := builder_utils.ObjFileIsUpToDate(ctx, sourcePath, sourceFile.ObjectPath(ctx), sourceFile.DepfilePath(ctx))
unchanged, err := builder_utils.ObjFileIsUpToDate(ctx, sourcePath, objPath, depPath)
if err != nil {
return i18n.WrapError(err)
}