8000 Use relative paths if commandline is too long · arduino/arduino-builder@ea2e91b · GitHub
[go: up one dir, main page]
Skip to content

Commit ea2e91b

Browse files
facchinmcmaglie
facchinm
authored and
cmaglie
committed
Use relative paths if commandline is too long
1 parent 758c3ec commit ea2e91b

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed

‎builder_utils/utils.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ func ExecRecipe(properties properties.Map, recipe string, removeUnsetProperties
418418
return bytes, i18n.WrapError(err)
419419
}
420420

421+
const COMMANDLINE_LIMIT = 32000
422+
421423
func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, removeUnsetProperties bool, echoCommandLine bool, echoOutput bool, logger i18n.Logger) (*exec.Cmd, error) {
422424
pattern := buildProperties[recipe]
423425
if pattern == constants.EMPTY_STRING {
@@ -430,7 +432,13 @@ func PrepareCommandForRecipe(buildProperties properties.Map, recipe string, remo
430432
commandLine = properties.DeleteUnexpandedPropsFromString(commandLine)
431433
}
432434

433-
command, err := utils.PrepareCommand(commandLine, logger)
435+
relativePath := ""
436+
437+
if len(commandLine) > COMMANDLINE_LIMIT {
438+
relativePath = buildProperties[constants.BUILD_PROPERTIES_BUILD_PATH]
439+
}
440+
441+
command, err := utils.PrepareCommand(commandLine, logger, relativePath)
434442
if err != nil {
435443
return nil, i18n.WrapError(err)
436444
}

‎ctags_runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (s *CTagsRunner) Run(ctx *types.Context) error {
5656
}
5757

5858
commandLine := properties.ExpandPropsInString(pattern)
59-
command, err := utils.PrepareCommand(commandLine, logger)
59+
command, err := utils.PrepareCommand(commandLine, logger, "")
6060
if err != nil {
6161
return i18n.WrapError(err)
6262
}

‎preprocess_sketch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (s *ArduinoPreprocessorRunner) Run(ctx *types.Context) error {
8888
}
8989

9090
commandLine := properties.ExpandPropsInString(pattern)
91-
command, err := utils.PrepareCommand(commandLine, logger)
91+
command, err := utils.PrepareCommand(commandLine, logger, "")
9292
if err != nil {
9393
return i18n.WrapError(err)
9494
}

‎utils/utils.go

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func TrimSpace(value string) string {
231231

232232
type argFilterFunc func(int, string, []string) bool
233233

234-
func PrepareCommandFilteredArgs(pattern string, filter argFilterFunc, logger i18n.Logger) (*exec.Cmd, error) {
234+
func PrepareCommandFilteredArgs(pattern string, filter argFilterFunc, logger i18n.Logger, relativePath string) (*exec.Cmd, error) {
235235
parts, err := ParseCommandLine(pattern, logger)
236236
if err != nil {
237237
return nil, i18n.WrapError(err)
@@ -241,19 +241,36 @@ func PrepareCommandFilteredArgs(pattern string, filter argFilterFunc, logger i18
241241
var args []string
242242
for idx, part := range parts {
243243
if filter(idx, part, parts) {
244+
// if relativePath is specified, the overall commandline is too long for the platform
245+
// try reducing the length by making the filenames relative
246+
// and changing working directory to build.path
247+
if relativePath != "" {
248+
if _, err := os.Stat(part); !os.IsNotExist(err) {
249+
tmp, err := filepath.Rel(relativePath, part)
250+
if err == nil {
251+
part = tmp
252+
}
253+
}
254+
}
244255
args = append(args, part)
245256
}
246257
}
247258

248-
return exec.Command(command, args...), nil
259+
cmd := exec.Command(command, args...)
260+
261+
if relativePath != "" {
262+
cmd.Dir = relativePath
263+
}
264+
265+
return cmd, nil
249266
}
250267

251268
func filterEmptyArg(_ int, arg string, _ []string) bool {
252269
return arg != constants.EMPTY_STRING
253270
}
254271

255-
func PrepareCommand(pattern string, logger i18n.Logger) (*exec.Cmd, error) {
256-
return PrepareCommandFilteredArgs(pattern, filterEmptyArg, logger)
272+
func PrepareCommand(pattern string, logger i18n.Logger, relativePath string) (*exec.Cmd, error) {
273+
return PrepareCommandFilteredArgs(pattern, filterEmptyArg, logger, relativePath)
257274
}
258275

259276
func MapHas(aMap map[string]interface{}, key string) bool {

0 commit comments

Comments
 (0)
0