builder: RunRecipe: run either a set of recipes or a single recipe

Recipes must follow the 'prefix.NNN.suffix' pattern, where 'NNN' is a
number. When there is also a single 'prefix.suffix' property defined,
make sure to not include that in the list of recipes to run. However, if
no numbered recipes are found, use the single 'prefix.suffix' form if it
exists.

This allows to have both a single recipe and a set of numbered recipes
in the same build properties, for backwards compatibility.

Signed-off-by: Luca Burelli <[email protected]>

Author: pillo79

internal/arduino/builder/builder.go

@@ -464,7 +464,7 @@ func (b *Builder) build() error {
 	}
 	b.Progress.CompleteStep()
 
-	if err := b.RunRecipe("recipe.objcopy.", ".pattern", true); err != nil {
+	if err := b.RunRecipe("recipe.objcopy", ".pattern", true); err != nil {
 		return err
 	}
 	b.Progress.CompleteStep()

internal/arduino/builder/recipe.go

@@ -60,12 +60,20 @@ func (b *Builder) RunRecipe(prefix, suffix string, skipIfOnlyUpdatingCompilation
 
 func findRecipes(buildProperties *properties.Map, patternPrefix string, patternSuffix string) []string {
 	var recipes []string
+
+	exactKey := patternPrefix + patternSuffix
+
 	for _, key := range buildProperties.Keys() {
-		if strings.HasPrefix(key, patternPrefix) && strings.HasSuffix(key, patternSuffix) && buildProperties.Get(key) != "" {
+		if key != exactKey && strings.HasPrefix(key, patternPrefix) && strings.HasSuffix(key, patternSuffix) && buildProperties.Get(key) != "" {
 			recipes = append(recipes, key)
 		}
 	}
 
+	// If no recipes were found, check if the exact key exists
+	if len(recipes) == 0 && buildProperties.Get(exactKey) != "" {
+		recipes = append(recipes, exactKey)
+	}
+
 	sort.Strings(recipes)
 
 	return recipes