Changed field name Folder->InstallDir

Author: cmaglie

setup_build_properties.go

@@ -73,10 +73,10 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	}
 
 	buildProperties["build.core"] = ctx.BuildCore
-	buildProperties["build.core.path"] = filepath.Join(actualPlatform.Folder, "cores", buildProperties["build.core"])
-	buildProperties["build.system.path"] = filepath.Join(actualPlatform.Folder, "system")
-	buildProperties["runtime.platform.path"] = targetPlatform.Folder
-	buildProperties["runtime.hardware.path"] = filepath.Join(targetPlatform.Folder, "..")
+	buildProperties["build.core.path"] = actualPlatform.InstallDir.Join("cores", buildProperties["build.core"]).String()
+	buildProperties["build.system.path"] = actualPlatform.InstallDir.Join("system").String()
+	buildProperties["runtime.platform.path"] = targetPlatform.InstallDir.String()
+	buildProperties["runtime.hardware.path"] = targetPlatform.InstallDir.Join("..").String()
 	buildProperties["runtime.ide.version"] = ctx.ArduinoAPIVersion
 	buildProperties["runtime.ide.path"] = exPath
 	buildProperties["build.fqbn"] = ctx.FQBN.String()
@@ -95,7 +95,7 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 		} else {
 			variantPlatform = targetPlatform
 		}
-		buildProperties["build.variant.path"] = filepath.Join(variantPlatform.Folder, "variants", variant)
+		buildProperties["build.variant.path"] = variantPlatform.InstallDir.Join("variants", variant).String()
 	}
 
 	for _, tool := range ctx.AllTools {

target_board_resolver.go

@@ -57,8 +57,8 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
 	core = core[strings.Index(core, ":")+1:]
 
 	if ctx.Verbose {
-		logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_BOARD, targetBoard.BoardId, targetPlatform.Folder)
-		logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_CORE, core, actualPlatform.Folder)
+		logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_BOARD, targetBoard.BoardId, targetPlatform.InstallDir)
+		logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_CORE, core, actualPlatform.InstallDir)
 	}
 
 	ctx.BuildCore = core