Fix compile error when --preprocess or --show-properties were passed (arduino#331)

masci · web-flow · commit d81cbbf7d12a · 2019-08-09T17:08:47.000+02:00
* do not expect binary artifacts when preprocess or show-properties

* remove noisy line
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -158,18 +158,16 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	builderCtx.ExecStdout = outStream
 	builderCtx.ExecStderr = errStream
 	builderCtx.SetLogger(i18n.LoggerToCustomStreams{Stdout: outStream, Stderr: errStream})
+
+	// if --preprocess or --show-properties were passed, we can stop here
 	if req.GetShowProperties() {
-		err = builder.RunParseHardwareAndDumpBuildProperties(builderCtx)
+		return &rpc.CompileResp{}, builder.RunParseHardwareAndDumpBuildProperties(builderCtx)
 	} else if req.GetPreprocess() {
-		if err = builder.RunPreprocess(builderCtx); err != nil {
-			return nil, fmt.Errorf("preprocessing sketch: %s", err)
-		}
-		return &rpc.CompileResp{}, nil
-	} else {
-		err = builder.RunBuilder(builderCtx)
+		return &rpc.CompileResp{}, builder.RunPreprocess(builderCtx)
 	}
 
-	if err != nil {
+	// if it's a regular build, go on...
+	if err := builder.RunBuilder(builderCtx); err != nil {
 		return nil, fmt.Errorf("build failed: %s", err)
 	}
 
diff --git a/legacy/builder/wipeout_build_path_if_build_options_changed.go b/legacy/builder/wipeout_build_path_if_build_options_changed.go
@@ -49,7 +49,6 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 	}
 	buildOptionsJson := ctx.BuildOptionsJson
 	previousBuildOptionsJson := ctx.BuildOptionsJsonPrevious
-	logger := ctx.GetLogger()
 
 	var opts *properties.Map
 	var prevOpts *properties.Map
@@ -79,7 +78,9 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 		}
 	}
 
-	logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED)
+	// FIXME: this should go outside legacy and behind a `logrus` call so users can
+	// control when this should be printed.
+	// logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED)
 
 	buildPath := ctx.BuildPath
 	files, err := gohasissues.ReadDir(buildPath.String())

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ func (s WipeoutBuildPathIfBuildOptionsChanged) Run(ctx types.Context) error {`
`49`	`49`	`}`
`50`	`50`	`buildOptionsJson := ctx.BuildOptionsJson`
`51`	`51`	`previousBuildOptionsJson := ctx.BuildOptionsJsonPrevious`
`52`		`- logger := ctx.GetLogger()`
`53`	`52`
`54`	`53`	`var opts *properties.Map`
`55`	`54`	`var prevOpts *properties.Map`
`@@ -79,7 +78,9 @@ func (s WipeoutBuildPathIfBuildOptionsChanged) Run(ctx types.Context) error {`
`79`	`78`	`}`
`80`	`79`	`}`
`81`	`80`
`82`		`- logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED)`
	`81`	+ // FIXME: this should go outside legacy and behind a `logrus` call so users can
	`82`	`+ // control when this should be printed.`
	`83`	`+ // logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED)`
`83`	`84`
`84`	`85`	`buildPath := ctx.BuildPath`
`85`	`86`	`files, err := gohasissues.ReadDir(buildPath.String())`