Skip to content

builder.GenBuildPath now tolerates missing sketch folder #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2019
Merged

builder.GenBuildPath now tolerates missing sketch folder #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions arduino/builder/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ import (
"crypto/md5"
"encoding/hex"
"os"
"path/filepath"
"strings"

"github.com/arduino/go-paths-helper"
"github.com/pkg/errors"
)

// GenBuildPath generates a suitable name for the build folder
func GenBuildPath(sketchPath string) string {
md5SumBytes := md5.Sum([]byte(sketchPath))
// GenBuildPath generates a suitable name for the build folder.
// The sketchPath, if not nil, is also used to furhter differentiate build paths.
func GenBuildPath(sketchPath *paths.Path) *paths.Path {
path := ""
if sketchPath != nil {
path = sketchPath.String()
}
md5SumBytes := md5.Sum([]byte(path))
md5Sum := strings.ToUpper(hex.EncodeToString(md5SumBytes[:]))

return filepath.Join(os.TempDir(), "arduino-sketch-"+md5Sum)
return paths.TempDir().Join("arduino-sketch-" + md5Sum)
}

// EnsureBuildPathExists creates the build path if doesn't already exists.
Expand Down
6 changes: 5 additions & 1 deletion arduino/builder/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"testing"

"github.com/arduino/arduino-cli/arduino/builder"
"github.com/arduino/go-paths-helper"
"github.com/stretchr/testify/assert"
)

Expand All @@ -36,7 +37,10 @@ func tmpDirOrDie() string {

func TestGenBuildPath(t *testing.T) {
want := filepath.Join(os.TempDir(), "arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
assert.Equal(t, want, builder.GenBuildPath("foo"))
assert.Equal(t, want, builder.GenBuildPath(paths.New("foo")).String())

want = filepath.Join(os.TempDir(), "arduino-sketch-D41D8CD98F00B204E9800998ECF8427E")
assert.Equal(t, want, builder.GenBuildPath(nil).String())
}

func TestEnsureBuildPathExists(t *testing.T) {
Expand Down
7 changes: 3 additions & 4 deletions legacy/builder/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import (
"github.com/arduino/arduino-cli/legacy/builder/phases"
"github.com/arduino/arduino-cli/legacy/builder/types"
"github.com/arduino/arduino-cli/legacy/builder/utils"
"github.com/arduino/go-paths-helper"
)

var MAIN_FILE_VALID_EXTENSIONS = map[string]bool{".ino": true, ".pde": true}
Expand All @@ -58,7 +57,7 @@ type Builder struct{}

func (s *Builder) Run(ctx *types.Context) error {
if ctx.BuildPath == nil {
ctx.BuildPath = paths.New(bldr.GenBuildPath(ctx.SketchLocation.String()))
ctx.BuildPath = bldr.GenBuildPath(ctx.SketchLocation)
}

if err := bldr.EnsureBuildPathExists(ctx.BuildPath.String()); err != nil {
Expand Down Expand Up @@ -150,7 +149,7 @@ type Preprocess struct{}

func (s *Preprocess) Run(ctx *types.Context) error {
if ctx.BuildPath == nil {
ctx.BuildPath = paths.New(bldr.GenBuildPath(ctx.SketchLocation.String()))
ctx.BuildPath = bldr.GenBuildPath(ctx.SketchLocation)
}

if err := bldr.EnsureBuildPathExists(ctx.BuildPath.String()); err != nil {
Expand Down Expand Up @@ -186,7 +185,7 @@ type ParseHardwareAndDumpBuildProperties struct{}

func (s *ParseHardwareAndDumpBuildProperties) Run(ctx *types.Context) error {
if ctx.BuildPath == nil {
ctx.BuildPath = paths.New(bldr.GenBuildPath(ctx.SketchLocation.String()))
ctx.BuildPath = bldr.GenBuildPath(ctx.SketchLocation)
}

commands := []types.Command{
Expand Down