[mynewt-newt] 01/02: builder: Fix names in pkg.yml

[andk]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git

commit 1785cb87967cc9763f7a70c41d46f59d85bbe465
Author: Andrzej Kaczmarek <andrzej.kaczma...@codecoup.pl>
AuthorDate: Thu Jan 26 15:18:12 2023 +0100

    builder: Fix names in pkg.yml
    
    This adds consistent naming for pkg settings to include/ignore source
    files and directories in pkg.yml:
    - source_dirs
    - ignore_dirs
    - ignore_files
    
    Old names still work for backwards compatibility, but only if new
    variant is not used.
---
 newt/builder/buildpackage.go | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/newt/builder/buildpackage.go b/newt/builder/buildpackage.go
index 40e4fb06..94535e62 100644
--- a/newt/builder/buildpackage.go
+++ b/newt/builder/buildpackage.go
@@ -171,9 +171,15 @@ func (bpkg *BuildPackage) CompilerInfo(
        ci.IgnoreFiles = []*regexp.Regexp{}
 
        ignPats, err := bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
-               "pkg.ign_files", settings)
+               "pkg.ignore_files", settings)
        util.OneTimeWarningError(err)
 
+       if len(ignPats) == 0 {
+               ignPats, err = bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
+                       "pkg.ign_files", settings)
+               util.OneTimeWarningError(err)
+       }
+
        for _, str := range ignPats {
                re, err := regexp.Compile(str)
                if err != nil {
@@ -186,9 +192,15 @@ func (bpkg *BuildPackage) CompilerInfo(
        ci.IgnoreDirs = []*regexp.Regexp{}
 
        ignPats, err = bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
-               "pkg.ign_dirs", settings)
+               "pkg.ignore_dirs", settings)
        util.OneTimeWarningError(err)
 
+       if len(ignPats) == 0 {
+               ignPats, err = bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
+                       "pkg.ign_dirs", settings)
+               util.OneTimeWarningError(err)
+       }
+
        for _, str := range ignPats {
                re, err := regexp.Compile(str)
                if err != nil {
@@ -199,9 +211,15 @@ func (bpkg *BuildPackage) CompilerInfo(
        }
 
        bpkg.SourceDirectories, err = bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
-               "pkg.src_dirs", settings)
+               "pkg.source_dirs", settings)
        util.OneTimeWarningError(err)
 
+       if len(bpkg.SourceDirectories) == 0 {
+               bpkg.SourceDirectories, err = 
bpkg.rpkg.Lpkg.PkgY.GetValStringSlice(
+                       "pkg.src_dirs", settings)
+               util.OneTimeWarningError(err)
+       }
+
        includePaths, err := bpkg.recursiveIncludePaths(b)
        if err != nil {
                return nil, err