Slightly simplify utils.compileFileWithRecipe

cmaglie · cmaglie · commit fffa451acd60 · 2019-08-28T19:31:37.000+02:00
This commit should be equivalent, no semantic changes just simplified
the notation.
diff --git a/legacy/builder/builder_utils/utils.go b/legacy/builder/builder_utils/utils.go
@@ -237,28 +237,29 @@ func compileFileWithRecipe(ctx *types.Context, sourcePath *paths.Path, source *p
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
-	properties.Set(constants.BUILD_PROPERTIES_OBJECT_FILE, buildPath.JoinPath(relativeSource).String()+".o")
+	depsFile := buildPath.Join(relativeSource.String() + ".d")
+	objectFile := buildPath.Join(relativeSource.String() + ".o")
 
-	err = properties.GetPath(constants.BUILD_PROPERTIES_OBJECT_FILE).Parent().MkdirAll()
+	properties.SetPath(constants.BUILD_PROPERTIES_OBJECT_FILE, objectFile)
+	err = objectFile.Parent().MkdirAll()
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
 
-	objIsUpToDate, err := ObjFileIsUpToDate(ctx, properties.GetPath(constants.BUILD_PROPERTIES_SOURCE_FILE), properties.GetPath(constants.BUILD_PROPERTIES_OBJECT_FILE), buildPath.Join(relativeSource.String()+".d"))
+	objIsUpToDate, err := ObjFileIsUpToDate(ctx, source, objectFile, depsFile)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
-
 	if !objIsUpToDate {
 		_, _, err = ExecRecipe(ctx, properties, recipe, false /* stdout */, utils.ShowIfVerbose /* stderr */, utils.Show)
 		if err != nil {
 			return nil, i18n.WrapError(err)
 		}
 	} else if ctx.Verbose {
-		logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, properties.Get(constants.BUILD_PROPERTIES_OBJECT_FILE))
+		logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, objectFile)
 	}
 
-	return properties.GetPath(constants.BUILD_PROPERTIES_OBJECT_FILE), nil
+	return objectFile, nil
 }
 
 func ObjFileIsUpToDate(ctx *types.Context, sourceFile, objectFile, dependencyFile *paths.Path) (bool, error) {

Original file line number	Diff line number	Diff line change
`@@ -237,28 +237,29 @@ func compileFileWithRecipe(ctx types.Context, sourcePath paths.Path, source *p`
`237`	`237`	`if err != nil {`
`238`	`238`	`return nil, i18n.WrapError(err)`
`239`	`239`	`}`
`240`		`- properties.Set(constants.BUILD_PROPERTIES_OBJECT_FILE, buildPath.JoinPath(relativeSource).String()+".o")`
	`240`	`+ depsFile := buildPath.Join(relativeSource.String() + ".d")`
	`241`	`+ objectFile := buildPath.Join(relativeSource.String() + ".o")`
`241`	`242`
`242`		`- err = properties.GetPath(constants.BUILD_PROPERTIES_OBJECT_FILE).Parent().MkdirAll()`
	`243`	`+ properties.SetPath(constants.BUILD_PROPERTIES_OBJECT_FILE, objectFile)`
	`244`	`+ err = objectFile.Parent().MkdirAll()`
`243`	`245`	`if err != nil {`
`244`	`246`	`return nil, i18n.WrapError(err)`
`245`	`247`	`}`
`246`	`248`
`247`		`- objIsUpToDate, err := ObjFileIsUpToDate(ctx, properties.GetPath(constants.BUILD_PROPERTIES_SOURCE_FILE), properties.GetPath(constants.BUILD_PROPERTIES_OBJECT_FILE), buildPath.Join(relativeSource.String()+".d"))`
	`249`	`+ objIsUpToDate, err := ObjFileIsUpToDate(ctx, source, objectFile, depsFile)`
`248`	`250`	`if err != nil {`
`249`	`251`	`return nil, i18n.WrapError(err)`
`250`	`252`	`}`
`251`		`-`
`252`	`253`	`if !objIsUpToDate {`
`253`	`254`	`_, _, err = ExecRecipe(ctx, properties, recipe, false /* stdout /, utils.ShowIfVerbose / stderr */, utils.Show)`
`254`	`255`	`if err != nil {`
`255`	`256`	`return nil, i18n.WrapError(err)`
`256`	`257`	`}`
`257`	`258`	`} else if ctx.Verbose {`
`258`		`- logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, properties.Get(constants.BUILD_PROPERTIES_OBJECT_FILE))`
	`259`	`+ logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, objectFile)`
`259`	`260`	`}`
`260`	`261`
`261`		`- return properties.GetPath(constants.BUILD_PROPERTIES_OBJECT_FILE), nil`
	`262`	`+ return objectFile, nil`
`262`	`263`	`}`
`263`	`264`
`264`	`265`	`func ObjFileIsUpToDate(ctx types.Context, sourceFile, objectFile, dependencyFile paths.Path) (bool, error) {`