Use relative paths if commandline is too long

Author: facchinm

src/arduino.cc/builder/builder_utils/utils.go

@@ -418,6 +418,8 @@ func ExecRecipe(properties properties.Map, recipe string, removeUnsetProperties
 	return bytes, i18n.WrapError(err)
 }
 
+const COMMANDLINE_LIMIT = 32000
+
 func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, echoOutput bool, logger i18n.Logger) (*exec.Cmd, error) {
 	pattern := buildProperties[recipe]
 	if pattern == constants.EMPTY_STRING {
@@ -433,7 +435,13 @@ func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, remo
 		}
 	}
 
-	command, err := utils.PrepareCommand(commandLine, logger)
+	relativePath := ""
+
+	if len(commandLine) > COMMANDLINE_LIMIT {
+		relativePath = buildProperties[constants.BUILD_PROPERTIES_BUILD_PATH]
+	}
+
+	command, err := utils.PrepareCommand(commandLine, logger, relativePath)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}

src/arduino.cc/builder/ctags_runner.go

@@ -56,7 +56,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 i18n.WrapError(err)
 	}

src/arduino.cc/builder/preprocess_sketch.go

@@ -88,7 +88,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 i18n.WrapError(err)
 	}

src/arduino.cc/builder/utils/utils.go

@@ -231,7 +231,7 @@ func TrimSpace(value string) string {
 
 type argFilterFunc func(int, string, []string) bool
 
-func PrepareCommandFilteredArgs(pattern string, filter argFilterFunc, logger i18n.Logger) (*exec.Cmd, error) {
+func PrepareCommandFilteredArgs(pattern string, filter argFilterFunc, logger i18n.Logger, relativePath string) (*exec.Cmd, error) {
 	parts, err := ParseCommandLine(pattern, logger)
 	if err != nil {
 		return nil, i18n.WrapError(err)
@@ -241,19 +241,36 @@ func PrepareCommandFilteredArgs(pattern string, filter argFilterFunc, logger i18
 	var args []string
 	for idx, part := range parts {
 		if filter(idx, part, parts) {
+			// 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 {
+						part = tmp
+					}
+				}
+			}
 			args = append(args, part)
 		}
 	}
 
-	return exec.Command(command, args...), nil
+	cmd := exec.Command(command, args...)
+
+	if relativePath != "" {
+		cmd.Dir = relativePath
+	}
+
+	return cmd, nil
 }
 
 func filterEmptyArg(_ int, arg string, _ []string) bool {
 	return arg != constants.EMPTY_STRING
 }
 
-func PrepareCommand(pattern string, logger i18n.Logger) (*exec.Cmd, error) {
-	return PrepareCommandFilteredArgs(pattern, filterEmptyArg, logger)
+func PrepareCommand(pattern string, logger i18n.Logger, relativePath string) (*exec.Cmd, error) {
+	return PrepareCommandFilteredArgs(pattern, filterEmptyArg, logger, relativePath)
 }
 
 func MapHas(aMap map[string]interface{}, key string) bool {