Skip to content

Commit c4191da

Browse files
sago35aykevl
authored andcommitted
gdb: support -ocd-output on windows
1 parent 3fdd1a9 commit c4191da

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/chromedp/chromedp v0.6.4
99
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
1010
github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892
11+
github.com/mattn/go-colorable v0.1.8
1112
go.bug.st/serial v1.1.2
1213
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78
1314
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA
2323
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
2424
github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892 h1:6J+qramlHVLmiBOgRiBOnQkno8uprqG6YFFQTt6uYIw=
2525
github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892/go.mod h1:Pb6XcsXyropB9LNHhnqaknG/vEwYztLkQzVCHv8sQ3M=
26+
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
27+
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
28+
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
29+
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
2630
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2731
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2832
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -41,6 +45,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
4145
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4246
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX0Az1Bw5HF7PDraD+qU=
4347
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
48+
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
49+
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4450
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4551
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 h1:nVuTkr9L6Bq62qpUqKo/RnZCFfzDBL0bYo6w9OJUqZY=
4652
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"syscall"
2020
"time"
2121

22+
"github.com/mattn/go-colorable"
2223
"github.com/tinygo-org/tinygo/builder"
2324
"github.com/tinygo-org/tinygo/compileopts"
2425
"github.com/tinygo-org/tinygo/goenv"
@@ -393,7 +394,7 @@ func FlashGDB(pkgName string, ocdOutput bool, options *compileopts.Options) erro
393394
if ocdOutput {
394395
// Make it clear which output is from the daemon.
395396
w := &ColorWriter{
396-
Out: os.Stderr,
397+
Out: colorable.NewColorableStderr(),
397398
Prefix: "openocd: ",
398399
Color: TermColorYellow,
399400
}
@@ -408,7 +409,7 @@ func FlashGDB(pkgName string, ocdOutput bool, options *compileopts.Options) erro
408409
if ocdOutput {
409410
// Make it clear which output is from the daemon.
410411
w := &ColorWriter{
411-
Out: os.Stderr,
412+
Out: colorable.NewColorableStderr(),
412413
Prefix: "jlink: ",
413414
Color: TermColorYellow,
414415
}

0 commit comments

Comments
 (0)