Commit 18335b6

committed

Split composed sketch and preprocessed sketch into different files

1 parent a838351 commit 18335b6Copy full SHA for 18335b6

File tree

3 files changed

-15

lines changed

internal/arduino/builder
- internal
  - detector
    - detector.go
  - preprocessor
    - ctags.go
- sketch.go

3 files changed

-15

lines changed

`‎internal/arduino/builder/internal/detector/detector.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func (l *SketchLibrariesDetector) findIncludes(`
`289`	`289`	`sourceFileQueue := &uniqueSourceFileQueue{}`
`290`	`290`
`291`	`291`	`if !l.useCachedLibrariesResolution {`
`292`		`- mergedfile, err := makeSourceFile(sketchBuildPath, sketchBuildPath, paths.New(sketch.MainFile.Base()+".cpp"))`
	`292`	`+ mergedfile, err := makeSourceFile(sketchBuildPath, sketchBuildPath, paths.New(sketch.MainFile.Base()+".cpp.merged"))`
`293`	`293`	`if err != nil {`
`294`	`294`	`return err`
`295`	`295`	`}`

`‎internal/arduino/builder/internal/preprocessor/ctags.go‎`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,19 +57,17 @@ func PreprocessSketchWithCtags(`
`57`	`57`
`58`	`58`	`// Check if the preprocessed file is already up-to-date`
`59`	`59`	`unpreprocessedSourceFile := buildPath.Join("sketch", sketch.MainFile.Base()+".cpp.merged")`
`60`		`- sourceFile := buildPath.Join("sketch", sketch.MainFile.Base()+".cpp")`
	`60`	`+ preprocessedSourceFile := buildPath.Join("sketch", sketch.MainFile.Base()+".cpp")`
`61`	`61`	`if unpreprocessedStat, err := unpreprocessedSourceFile.Stat(); err != nil {`
`62`	`62`	`return nil, fmt.Errorf("%s: %w", i18n.Tr("unable to open unpreprocessed source file"), err)`
`63`		`- } else if sourceStat, err := sourceFile.Stat(); err != nil {`
`64`		`- return nil, fmt.Errorf("%s: %w", i18n.Tr("unable to open source file"), err)`
`65`		`- } else if unpreprocessedStat.ModTime().Before(sourceStat.ModTime()) {`
	`63`	`+ } else if sourceStat, err := preprocessedSourceFile.Stat(); err == nil && unpreprocessedStat.ModTime().Before(sourceStat.ModTime()) {`
`66`	`64`	`fmt.Fprintln(stdout, i18n.Tr("Sketch is unchanged, skipping preprocessing."))`
`67`	`65`	`res := &runner.Result{Stdout: stdout.Bytes(), Stderr: stderr.Bytes()}`
`68`	`66`	`return res, nil`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`// Run GCC preprocessor`
`72`		`- result := GCC(sourceFile, ctagsTarget, includes, buildProperties).Run(ctx)`
	`70`	`+ result := GCC(unpreprocessedSourceFile, ctagsTarget, includes, buildProperties).Run(ctx)`
`73`	`71`	`stdout.Write(result.Stdout)`
`74`	`72`	`stderr.Write(result.Stderr)`
`75`	`73`	`if err := result.Error; err != nil {`
`@@ -81,7 +79,7 @@ func PreprocessSketchWithCtags(`
`81`	`79`	`fmt.Fprintf(stderr, "%s: %s",`
`82`	`80`	`i18n.Tr("An error occurred adding prototypes"),`
`83`	`81`	`i18n.Tr("the compilation database may be incomplete or inaccurate"))`
`84`		`- if err := sourceFile.CopyTo(ctagsTarget); err != nil {`
	`82`	`+ if err := unpreprocessedSourceFile.CopyTo(ctagsTarget); err != nil {`
`85`	`83`	`return &runner.Result{Args: result.Args, Stdout: stdout.Bytes(), Stderr: stderr.Bytes()}, err`
`86`	`84`	`}`
`87`	`85`	`}`
`@@ -114,7 +112,7 @@ func PreprocessSketchWithCtags(`
`114`	`112`
`115`	`113`	`// Add prototypes to the original sketch source`
`116`	`114`	`var source string`
`117`		`- if sourceData, err := sourceFile.ReadFile(); err == nil {`
	`115`	`+ if sourceData, err := unpreprocessedSourceFile.ReadFile(); err == nil {`
`118`	`116`	`source = string(sourceData)`
`119`	`117`	`} else {`
`120`	`118`	`return &runner.Result{Args: result.Args, Stdout: stdout.Bytes(), Stderr: stderr.Bytes()}, err`
`@@ -148,7 +146,7 @@ func PreprocessSketchWithCtags(`
`148`	`146`	`}`
`149`	`147`
`150`	`148`	`// Write back arduino-preprocess output to the sourceFile`
`151`		`- err = sourceFile.WriteFile([]byte(preprocessedSource))`
	`149`	`+ err = preprocessedSourceFile.WriteFile([]byte(preprocessedSource))`
`152`	`150`	`return &runner.Result{Args: result.Args, Stdout: stdout.Bytes(), Stderr: stderr.Bytes()}, err`
`153`	`151`	`}`
`154`	`152`

`‎internal/arduino/builder/sketch.go‎`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,6 @@ func (b *Builder) prepareSketchBuildPath() error {`
`62`	`62`	`if err := destFileUnpreprocessed.WriteFile([]byte(mergedSource)); err != nil {`
`63`	`63`	`return err`
`64`	`64`	`}`
`65`		`-`
`66`		`- b.logger.Warn(i18n.Tr("Generating sketch files in build path"))`
`67`		`- destFile := b.sketchBuildPath.Join(b.sketch.MainFile.Base() + ".cpp")`
`68`		`- if err := destFile.WriteFile([]byte(mergedSource)); err != nil {`
`69`		`- return err`
`70`		`- }`
`71`	`65`	`} else {`
`72`	`66`	`b.logger.Warn(fmt.Sprintf("%s %s", i18n.Tr("Generating sketch files in build path..."), i18n.Tr("(sketch unchanged)")))`
`73`	`67`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 18335b6

File tree

3 files changed

3 files changed

`‎internal/arduino/builder/internal/detector/detector.go‎`

`‎internal/arduino/builder/internal/preprocessor/ctags.go‎`

`‎internal/arduino/builder/sketch.go‎`

0 commit comments