Add "vendor" field to Tools structure

will map into "packager" field of the json

Author: facchinm

setup_build_properties.go

@@ -93,6 +93,7 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	for _, tool := range tools {
 		buildProperties[constants.BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX+tool.Name+constants.BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX] = tool.Folder
 		buildProperties[constants.BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX+tool.Name+"-"+tool.Version+constants.BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX] = tool.Folder
+		buildProperties[constants.BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX+tool.Name+"-"+tool.Vendor+"-"+tool.Version+constants.BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX] = tool.Folder
 	}
 
 	if !utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_SOFTWARE) {

tools_loader.go

@@ -146,9 +146,10 @@ func loadToolsFrom(tools *[]*types.Tool, builtinToolsVersionsFilePath string) er
 		if row != constants.EMPTY_STRING {
 			rowParts := strings.Split(row, "=")
 			toolName := strings.Split(rowParts[0], ".")[1]
+			toolVendor := strings.Split(rowParts[0], ".")[0]
 			toolVersion := rowParts[1]
 			if !toolsSliceContains(tools, toolName, toolVersion) {
-				*tools = append(*tools, &types.Tool{Name: toolName, Version: toolVersion, Folder: folder})
+				*tools = append(*tools, &types.Tool{Name: toolName, Vendor: toolVendor, Version: toolVersion, Folder: folder})
 			}
 		}
 	}
@@ -190,8 +191,9 @@ func loadToolsFromFolderStructure(tools *[]*types.Tool, folder string) error {
 			if err != nil {
 				return i18n.WrapError(err)
 			}
+			toolVendor := filepath.Base(strings.Replace(folder, filepath.Base(folder), "", -1))
 			if !toolsSliceContains(tools, toolName.Name(), toolVersion.Name()) {
-				*tools = append(*tools, &types.Tool{Name: toolName.Name(), Version: toolVersion.Name(), Folder: toolFolder})
+				*tools = append(*tools, &types.Tool{Name: toolName.Name(), Vendor: toolVendor, Version: toolVersion.Name(), Folder: toolFolder})
 			}
 		}
 	}

types/types.go

@@ -153,6 +153,7 @@ type Tool struct {
 	Name    string
 	Version string
 	Folder  string
+	Vendor  string
 }
 
 type LibraryLayout uint16