cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-30 03:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc/dist: fix Windows breakage

Browse Source 
The files could use some attention on the
Windows side but better to wait until after
the upcoming release.

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/7621044
This commit is contained in:
Joe Poirier 2013-03-18 08:56:38 +11:00 committed by Andrew Gerrand
parent ecc174324c
commit b7b4783622
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc/dist/bindist.go vendored
View File

@ -386,9 +386,13 @@ func (b *Build) tour() error {
} }
// Copy gotour binary to tool directory as "tour"; invoked as "go tool tour". // Copy gotour binary to tool directory as "tour"; invoked as "go tool tour".
gotour := "gotour"
if runtime.GOOS == "windows" {
gotour = "gotour.exe"
}
return cp( return cp(
filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch, "tour"), filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch, "tour"),
filepath.Join(b.gopath, "bin", "gotour"), filepath.Join(b.gopath, "bin", gotour),
) )
} }
@ -620,8 +624,11 @@ func cp(dst, src string) error {
return err return err
} }
defer df.Close() defer df.Close()
if err := df.Chmod(fi.Mode()); err != nil { // Windows doesn't currently implement Fchmod
return err if runtime.GOOS != "windows" {
if err := df.Chmod(fi.Mode()); err != nil {
return err
}
} }
_, err = io.Copy(df, sf) _, err = io.Copy(df, sf)
return err return err