@@ -25,7 +25,7 @@ import (
25
25
26
26
type SourceFile struct {
27
27
// Path to the source file within the sketch/library root folder
28
- RelativePath * paths.Path
28
+ relativePath * paths.Path
29
29
30
30
// Set to the Library object of origin if this source file comes
31
31
// from a library
@@ -43,8 +43,7 @@ type SourceFile struct {
43
43
}
44
44
45
45
func (f * SourceFile ) Equals (g * SourceFile ) bool {
46
- return f .Library == g .Library &&
47
- f .RelativePath .EqualsTo (g .RelativePath ) &&
46
+ return f .relativePath .EqualsTo (g .relativePath ) &&
48
47
f .buildRoot .EqualsTo (g .buildRoot ) &&
49
48
f .sourceRoot .EqualsTo (g .sourceRoot )
50
49
}
@@ -74,20 +73,20 @@ func MakeSourceFile(ctx *Context, origin interface{}, path *paths.Path) (*Source
74
73
return nil , err
75
74
}
76
75
}
77
- res .RelativePath = path
76
+ res .relativePath = path
78
77
return res , nil
79
78
}
80
79
81
80
func (f * SourceFile ) SourcePath () * paths.Path {
82
- return f .sourceRoot .JoinPath (f .RelativePath )
81
+ return f .sourceRoot .JoinPath (f .relativePath )
83
82
}
84
83
85
84
func (f * SourceFile ) ObjectPath () * paths.Path {
86
- return f .buildRoot .Join (f .RelativePath .String () + ".o" )
85
+ return f .buildRoot .Join (f .relativePath .String () + ".o" )
87
86
}
88
87
89
88
func (f * SourceFile ) DepfilePath () * paths.Path {
90
- return f .buildRoot .Join (f .RelativePath .String () + ".d" )
89
+ return f .buildRoot .Join (f .relativePath .String () + ".d" )
91
90
}
92
91
93
92
type LibraryResolutionResult struct {
0 commit comments