Using semver for versioning

Author: cmaglie

setup_build_properties.go

@@ -100,11 +100,11 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 
 	for _, tool := range ctx.AllTools {
 		buildProperties["runtime.tools."+tool.Tool.Name+".path"] = tool.InstallDir.String()
-		buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version+".path"] = tool.InstallDir.String()
+		buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version.String()+".path"] = tool.InstallDir.String()
 	}
 	for _, tool := range ctx.RequiredTools {
 		buildProperties["runtime.tools."+tool.Tool.Name+".path"] = tool.InstallDir.String()
-		buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version+".path"] = tool.InstallDir.String()
+		buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version.String()+".path"] = tool.InstallDir.String()
 	}
 
 	if !utils.MapStringStringHas(buildProperties, "software") {

test/tools_loader_test.go

@@ -52,8 +52,8 @@ func (s ByToolIDAndVersion) Less(i, j int) bool {
 	if s[i].Tool.Name != s[j].Tool.Name {
 		return s[i].Tool.Name < s[j].Tool.Name
 	}
-	if s[i].Version != s[j].Version {
-		return s[i].Version < s[j].Version
+	if !s[i].Version.Equal(s[j].Version) {
+		return s[i].Version.LessThan(s[j].Version)
 	}
 	return s[i].InstallDir.String() < s[j].InstallDir.String()
 }