Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-cli
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Operations
Operations
Metrics
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-cli
Commits
4c32595f
Unverified
Commit
4c32595f
authored
Sep 26, 2019
by
Cristian Maglie
Committed by
GitHub
Sep 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
builder: try to setup Sketch only when SketchLocation is provided (#429)
parent
c9836a97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
legacy/builder/container_setup.go
legacy/builder/container_setup.go
+13
-11
No files found.
legacy/builder/container_setup.go
View file @
4c32595f
...
...
@@ -63,19 +63,21 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context)
}
}
// get abs path to sketch
sketchLocation
,
err
:=
ctx
.
SketchLocation
.
Abs
()
if
err
!=
nil
{
return
i18n
.
WrapError
(
err
)
}
if
ctx
.
SketchLocation
!=
nil
{
// get abs path to sketch
sketchLocation
,
err
:=
ctx
.
SketchLocation
.
Abs
()
if
err
!=
nil
{
return
i18n
.
WrapError
(
err
)
}
// load sketch
sketch
,
err
:=
bldr
.
SketchLoad
(
sketchLocation
.
String
(),
ctx
.
BuildPath
.
String
())
if
err
!=
nil
{
return
i18n
.
WrapError
(
err
)
// load sketch
sketch
,
err
:=
bldr
.
SketchLoad
(
sketchLocation
.
String
(),
ctx
.
BuildPath
.
String
())
if
err
!=
nil
{
return
i18n
.
WrapError
(
err
)
}
ctx
.
SketchLocation
=
paths
.
New
(
sketch
.
MainFile
.
Path
)
ctx
.
Sketch
=
types
.
SketchToLegacy
(
sketch
)
}
ctx
.
SketchLocation
=
paths
.
New
(
sketch
.
MainFile
.
Path
)
ctx
.
Sketch
=
types
.
SketchToLegacy
(
sketch
)
commands
=
[]
types
.
Command
{
&
SetupBuildProperties
{},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment