Move arduino-proprocessor under experimental flag

Author: facchinm

arduino-builder/main.go

@@ -88,6 +88,7 @@ const FLAG_DAEMON = "daemon"
 const FLAG_VID_PID = "vid-pid"
 const FLAG_JOBS = "jobs"
 const FLAG_TRACE = "trace"
+const FLAG_EXPERIMENTAL = "experimental"
 
 type foldersFlag []string
 
@@ -149,6 +150,7 @@ var daemonFlag *bool
 var vidPidFlag *string
 var jobsFlag *int
 var traceFlag *bool
+var experimentalFeatures *bool
 
 func init() {
 	compileFlag = flag.Bool(FLAG_ACTION_COMPILE, false, "compiles the given sketch")
@@ -176,6 +178,7 @@ func init() {
 	vidPidFlag = flag.String(FLAG_VID_PID, "", "specify to use vid/pid specific build properties, as defined in boards.txt")
 	jobsFlag = flag.Int(FLAG_JOBS, 0, "specify how many concurrent gcc processes should run at the same time. Defaults to the number of available cores on the running machine")
 	traceFlag = flag.Bool(FLAG_TRACE, false, "traces the whole process lifecycle")
+	experimentalFeatures = flag.Bool(FLAG_EXPERIMENTAL, false, "enables experimental features")
 }
 
 func main() {
@@ -222,6 +225,11 @@ func main() {
 
 	ctx := &types.Context{}
 
+	// place here all experimental features that should live under this flag
+	if *experimentalFeatures {
+		ctx.UseArduinoPreprocessor = true
+	}
+
 	if *daemonFlag {
 		var loggerBuffer []string
 		logger := i18n.AccumulatorLogger{}

builder.go

@@ -142,6 +142,18 @@ func (s *Builder) Run(ctx *types.Context) error {
 	return otherErr
 }
 
+type PreprocessSketch struct{}
+
+func (s *PreprocessSketch) Run(ctx *types.Context) error {
+	var commands []types.Command
+	if ctx.UseArduinoPreprocessor {
+		commands = append(commands, &PreprocessSketchArduino{})
+	} else {
+		commands = append(commands, &ContainerAddPrototypes{})
+	}
+	return runCommands(ctx, commands, true)
+}
+
 type Preprocess struct{}
 
 func (s *Preprocess) Run(ctx *types.Context) error {

preprocess_sketch.go

@@ -43,9 +43,9 @@ import (
 	"github.com/arduino/arduino-builder/utils"
 )
 
-type PreprocessSketch struct{}
+type PreprocessSketchArduino struct{}
 
-func (s *PreprocessSketch) Run(ctx *types.Context) error {
+func (s *PreprocessSketchArduino) Run(ctx *types.Context) error {
 	sourceFile := filepath.Join(ctx.SketchBuildPath, filepath.Base(ctx.Sketch.MainFile.Name)+".cpp")
 	commands := []types.Command{
 		&ArduinoPreprocessorRunner{},

types/context.go

@@ -100,6 +100,9 @@ type Context struct {
 
 	// Reuse old tools since the backing storage didn't change
 	CanUseCachedTools bool
+
+	// Experimental: use arduino-preprocessor to create prototypes
+	UseArduinoPreprocessor bool
 }
 
 func (ctx *Context) ExtractBuildOptions() properties.Map {