Skip to content

newt: Append include dirs of non-sdk packages #592

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

newt: Append include dirs of non-sdk packages #592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
newt: Append include dirs of non-sdk packages 
Now non-sdk packages can also use pkg.include_dirs field
  • Loading branch information
@m-gorecki
m-gorecki committed Jan 28, 2025
commit c8ff5b217cfe90e11295e0fd987d04188807e98a
38 changes: 19 additions & 19 deletions newt/builder/buildpackage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,31 +293,31 @@ func (bpkg *BuildPackage) publicIncludeDirs(b *Builder) []string {
addIncludeDir(&incls, bp+"/include/"+pkgBase+"/arch/"+bspPkg.Arch)
}

if bpkg.rpkg.Lpkg.Type() == pkg.PACKAGE_TYPE_SDK {
incls = append(incls, bspPkg.BasePath()+"/include/bsp/")
settings := b.cfg.AllSettingsForLpkg(bpkg.rpkg.Lpkg)

sdkIncls := bpkg.findSdkIncludes()
incls = append(incls, sdkIncls...)
inclDirs, err := bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
"pkg.include_dirs", settings)
util.OneTimeWarningError(err)

settings := b.cfg.AllSettingsForLpkg(bpkg.rpkg.Lpkg)
for _, dir := range inclDirs {
repo, path, err := newtutil.ParsePackageString(dir)

inclDirs, err := bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
"pkg.include_dirs", settings)
util.OneTimeWarningError(err)
if err != nil {
util.OneTimeWarningError(err)
}

for _, dir := range inclDirs {
repo, path, err := newtutil.ParsePackageString(dir)
if repo != "" {
incls = append(incls, "repos/"+repo+"/"+path)
} else {
incls = append(incls, bp+"/"+dir)
}
}

if err != nil {
util.OneTimeWarningError(err)
}
if bpkg.rpkg.Lpkg.Type() == pkg.PACKAGE_TYPE_SDK {
incls = append(incls, bspPkg.BasePath()+"/include/bsp/")

if repo != "" {
incls = append(incls, "repos/"+repo+"/"+path)
} else {
incls = append(incls, bp+"/"+dir)
}
}
sdkIncls := bpkg.findSdkIncludes()
incls = append(incls, sdkIncls...)
}

return incls
Expand Down
Loading