legacy: moving path-relativization code out of PrepareCommand

Author: cmaglie

legacy/builder/builder_utils/utils.go

@@ -507,19 +507,30 @@ func PrepareCommandForRecipe(ctx *types.Context, buildProperties *properties.Map
 		return nil, i18n.ErrorfWithLogger(logger, constants.MSG_PATTERN_MISSING, recipe)
 	}
 
-	var err error
 	commandLine := buildProperties.ExpandPropsInString(pattern)
 	if removeUnsetProperties {
 		commandLine = properties.DeleteUnexpandedPropsFromString(commandLine)
 	}
 
-	relativePath := ""
+	command, err := utils.PrepareCommand(commandLine, logger)
 
+	// if the overall commandline is too long for the platform
+	// try reducing the length by making the filenames relative
+	// and changing working directory to build.path
 	if len(commandLine) > COMMANDLINE_LIMIT {
-		relativePath = buildProperties.Get("build.path")
+		relativePath := buildProperties.Get("build.path")
+		for i, arg := range command.Args {
+			if _, err := os.Stat(arg); os.IsNotExist(err) {
+				continue
+			}
+			rel, err := filepath.Rel(relativePath, arg)
+			if err == nil && !strings.Contains(rel, "..") && len(rel) < len(arg) {
+				command.Args[i] = rel
+			}
+		}
+		command.Dir = relativePath
 	}
 
-	command, err := utils.PrepareCommand(commandLine, logger, relativePath)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}

legacy/builder/ctags_runner.go

@@ -41,7 +41,7 @@ func (s *CTagsRunner) Run(ctx *types.Context) error {
 	}
 
 	commandLine := properties.ExpandPropsInString(pattern)
-	command, err := utils.PrepareCommand(commandLine, logger, "")
+	command, err := utils.PrepareCommand(commandLine, logger)
 	if err != nil {
 		return errors.WithStack(err)
 	}

legacy/builder/preprocess_sketch.go

@@ -106,7 +106,7 @@ func (s *ArduinoPreprocessorRunner) Run(ctx *types.Context) error {
 	}
 
 	commandLine := properties.ExpandPropsInString(pattern)
-	command, err := utils.PrepareCommand(commandLine, logger, "")
+	command, err := utils.PrepareCommand(commandLine, logger)
 	if err != nil {
 		return errors.WithStack(err)
 	}

legacy/builder/utils/utils.go

@@ -189,7 +189,7 @@ func TrimSpace(value string) string {
 	return strings.TrimSpace(value)
 }
 
-func PrepareCommand(pattern string, logger i18n.Logger, relativePath string) (*exec.Cmd, error) {
+func PrepareCommand(pattern string, logger i18n.Logger) (*exec.Cmd, error) {
 	parts, err := ParseCommandLine(pattern, logger)
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -201,26 +201,10 @@ func PrepareCommand(pattern string, logger i18n.Logger, relativePath string) (*e
 		if part == "" {
 			continue
 		}
-		// if relativePath is specified, the overall commandline is too long for the platform
-		// try reducing the length by making the filenames relative
-		// and changing working directory to build.path
-		if relativePath != "" {
-			if _, err := os.Stat(part); !os.IsNotExist(err) {
-				tmp, err := filepath.Rel(relativePath, part)
-				if err == nil && !strings.Contains(tmp, "..") && len(tmp) < len(part) {
-					part = tmp
-				}
-			}
-		}
 		args = append(args, part)
 	}
 
 	cmd := exec.Command(command, args...)
-
-	if relativePath != "" {
-		cmd.Dir = relativePath
-	}
-
 	return cmd, nil
 }