Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates for Go 1.5

This commit is contained in:
Jakob Borg 2015-08-06 09:02:24 +02:00
parent 7d620a93b9
commit 0a803891a4
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build.go
View File

@ -36,6 +36,7 @@ var (
goos string goos string
noupgrade bool noupgrade bool
version string version string
goVersion float64
race bool race bool
) )
@ -70,7 +71,7 @@ func main() {
log.Printf("Unknown goarch %q; proceed with caution!", goarch) log.Printf("Unknown goarch %q; proceed with caution!", goarch)
} }
checkRequiredGoVersion() goVersion, _ = checkRequiredGoVersion()
if flag.NArg() == 0 { if flag.NArg() == 0 {
var tags []string var tags []string
@ -154,7 +155,7 @@ func main() {
} }
} }
func checkRequiredGoVersion() { func checkRequiredGoVersion() (float64, bool) {
ver := run("go", "version") ver := run("go", "version")
re := regexp.MustCompile(`go version go(\d+\.\d+)`) re := regexp.MustCompile(`go version go(\d+\.\d+)`)
if m := re.FindSubmatch(ver); len(m) == 2 { if m := re.FindSubmatch(ver); len(m) == 2 {
@ -163,14 +164,16 @@ func checkRequiredGoVersion() {
f, err := strconv.ParseFloat(vs, 64) f, err := strconv.ParseFloat(vs, 64)
if err != nil { if err != nil {
log.Printf("*** Couldn't parse Go version out of %q.\n*** This isn't known to work, proceed on your own risk.", vs) log.Printf("*** Couldn't parse Go version out of %q.\n*** This isn't known to work, proceed on your own risk.", vs)
return return 0, false
} }
if f < minGoVersion { if f < minGoVersion {
log.Fatalf("*** Go version %.01f is less than required %.01f.\n*** This is known not to work, not proceeding.", f, minGoVersion) log.Fatalf("*** Go version %.01f is less than required %.01f.\n*** This is known not to work, not proceeding.", f, minGoVersion)
} }
} else { return f, true
log.Printf("*** Unknown Go version %q.\n*** This isn't known to work, proceed on your own risk.", ver)
} }
log.Printf("*** Unknown Go version %q.\n*** This isn't known to work, proceed on your own risk.", ver)
return 0, false
} }
func setup() { func setup() {
@ -438,13 +441,18 @@ func clean() {
} }
func ldflags() string { func ldflags() string {
var b bytes.Buffer sep := ' '
if goVersion > 1.4 {
sep = '='
}
b := new(bytes.Buffer)
b.WriteString("-w") b.WriteString("-w")
b.WriteString(fmt.Sprintf(" -X main.Version %s", version)) fmt.Fprintf(b, " -X main.Version%c%s", sep, version)
b.WriteString(fmt.Sprintf(" -X main.BuildStamp %d", buildStamp())) fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp())
b.WriteString(fmt.Sprintf(" -X main.BuildUser %s", buildUser())) fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser())
b.WriteString(fmt.Sprintf(" -X main.BuildHost %s", buildHost())) fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost())
b.WriteString(fmt.Sprintf(" -X main.BuildEnv %s", buildEnvironment())) fmt.Fprintf(b, " -X main.BuildEnv%c%s", sep, buildEnvironment())
return b.String() return b.String()
} }
@ -742,7 +750,9 @@ func vet(pkg string) {
if falseAlarmComposites.Match(line) || exitStatus.Match(line) { if falseAlarmComposites.Match(line) || exitStatus.Match(line) {
continue continue
} }
log.Printf("%s", line) if len(line) > 0 {
log.Printf("%s", line)
}
} }
} }
@ -758,6 +768,8 @@ func lint(pkg string) {
if analCommentPolicy.Match(line) { if analCommentPolicy.Match(line) {
continue continue
} }
log.Printf("%s", line) if len(line) > 0 {
log.Printf("%s", line)
}
} }
} }

2
build.sh
View File

@ -64,9 +64,7 @@ case "${1:-default}" in
all) all)
go run build.go -goos darwin -goarch amd64 tar go run build.go -goos darwin -goarch amd64 tar
go run build.go -goos darwin -goarch 386 tar
go run build.go -goos dragonfly -goarch 386 tar
go run build.go -goos dragonfly -goarch amd64 tar go run build.go -goos dragonfly -goarch amd64 tar
go run build.go -goos freebsd -goarch 386 tar go run build.go -goos freebsd -goarch 386 tar