Merge pull request #2124 from calmh/go15

Updates for Go 1.5

build.go

@@ -36,6 +36,7 @@ var (
 	goos      string
 	noupgrade bool
 	version   string
+	goVersion float64
 	race      bool
 )
 
@@ -70,7 +71,7 @@ func main() {
 		log.Printf("Unknown goarch %q; proceed with caution!", goarch)
 	}
 
-	checkRequiredGoVersion()
+	goVersion, _ = checkRequiredGoVersion()
 
 	if flag.NArg() == 0 {
 		var tags []string
@@ -80,9 +81,9 @@ func main() {
 		install("./cmd/...", tags)
 
 		vet("./cmd/syncthing")
-		vet("./internal/...")
+		vet("./lib/...")
 		lint("./cmd/syncthing")
-		lint("./internal/...")
+		lint("./lib/...")
 		return
 	}
 
@@ -142,11 +143,11 @@ func main() {
 
 		case "vet":
 			vet("./cmd/syncthing")
-			vet("./internal/...")
+			vet("./lib/...")
 
 		case "lint":
 			lint("./cmd/syncthing")
-			lint("./internal/...")
+			lint("./lib/...")
 
 		default:
 			log.Fatalf("Unknown command %q", cmd)
@@ -154,7 +155,7 @@ func main() {
 	}
 }
 
-func checkRequiredGoVersion() {
+func checkRequiredGoVersion() (float64, bool) {
 	ver := run("go", "version")
 	re := regexp.MustCompile(`go version go(\d+\.\d+)`)
 	if m := re.FindSubmatch(ver); len(m) == 2 {
@@ -163,14 +164,16 @@ func checkRequiredGoVersion() {
 		f, err := strconv.ParseFloat(vs, 64)
 		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)
-			return
+			return 0, false
 		}
 		if 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() {
@@ -402,11 +405,11 @@ func setBuildEnv() {
 
 func assets() {
 	setBuildEnv()
-	runPipe("internal/auto/gui.files.go", "go", "run", "cmd/genassets/main.go", "gui")
+	runPipe("lib/auto/gui.files.go", "go", "run", "cmd/genassets/main.go", "gui")
 }
 
 func xdr() {
-	runPrint("go", "generate", "./internal/discover", "./internal/db")
+	runPrint("go", "generate", "./lib/discover", "./lib/db")
 }
 
 func translate() {
@@ -438,13 +441,18 @@ func clean() {
 }
 
 func ldflags() string {
-	var b bytes.Buffer
+	sep := ' '
+	if goVersion > 1.4 {
+		sep = '='
+	}
+
+	b := new(bytes.Buffer)
 	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()
 }
 
@@ -742,7 +750,9 @@ func vet(pkg string) {
 		if falseAlarmComposites.Match(line) || exitStatus.Match(line) {
 			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) {
 			continue
 		}
-		log.Printf("%s", line)
+		if len(line) > 0 {
+			log.Printf("%s", line)
+		}
 	}
 }

build.sh

@@ -46,7 +46,7 @@ case "${1:-default}" in
 
 	prerelease)
 		go run build.go transifex
-		git add -A gui/assets/ internal/auto/
+		git add -A gui/assets/ lib/auto/
 		pushd man ; ./refresh.sh ; popd
 		git add -A man
 		echo
@@ -64,9 +64,7 @@ case "${1:-default}" in
 
 	all)
 		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 freebsd -goarch 386 tar

check-contrib.sh

@@ -30,7 +30,7 @@ print-missing-authors() {
 }
 
 print-missing-copyright() {
-	find . -name \*.go | xargs egrep -L 'Copyright|automatically generated' | grep -v Godeps | grep -v internal/auto/
+	find . -name \*.go | xargs egrep -L 'Copyright|automatically generated' | grep -v Godeps | grep -v lib/auto/
 }
 
 authors=$(print-missing-authors)

cmd/stcompdirs/main.go

@@ -16,7 +16,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/syncthing/syncthing/internal/symlinks"
+	"github.com/syncthing/syncthing/lib/symlinks"
 )
 
 func main() {

cmd/stfileinfo/main.go

@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/scanner"
+	"github.com/syncthing/syncthing/lib/scanner"
 )
 
 func main() {

cmd/stfinddevice/main.go

@@ -12,7 +12,7 @@ import (
 	"os"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/discover"
+	"github.com/syncthing/syncthing/lib/discover"
 )
 
 func main() {

cmd/stindex/main.go

@@ -14,7 +14,7 @@ import (
 	"os"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )

cmd/syncthing/audit.go

@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 // The auditSvc subscribes to events and writes these in JSON format, one

cmd/syncthing/auditsvc_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 func TestAuditService(t *testing.T) {

cmd/syncthing/connections.go

@@ -15,9 +15,9 @@ import (
 	"time"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/model"
 	"github.com/thejerf/suture"
 )
 

cmd/syncthing/gui.go

@@ -26,15 +26,15 @@ import (
 
 	"github.com/calmh/logger"
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/auto"
+	"github.com/syncthing/syncthing/lib/auto"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/internal/discover"
+	"github.com/syncthing/syncthing/lib/discover"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/model"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
-	"github.com/syncthing/syncthing/internal/upgrade"
+	"github.com/syncthing/syncthing/lib/upgrade"
 	"github.com/vitrun/qart/qr"
 	"golang.org/x/crypto/bcrypt"
 )

cmd/syncthing/gui_auth.go

@@ -14,8 +14,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 	"golang.org/x/crypto/bcrypt"
 )
 

cmd/syncthing/gui_csrf.go

@@ -13,8 +13,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 var csrfTokens []string

cmd/syncthing/locations.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
 )
 
 type locationEnum string

cmd/syncthing/main.go

@@ -28,14 +28,14 @@ import (
 	"github.com/calmh/logger"
 	"github.com/juju/ratelimit"
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/internal/discover"
+	"github.com/syncthing/syncthing/lib/discover"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/model"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/symlinks"
+	"github.com/syncthing/syncthing/lib/symlinks"
-	"github.com/syncthing/syncthing/internal/upgrade"
+	"github.com/syncthing/syncthing/lib/upgrade"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/opt"

cmd/syncthing/main_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/model"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"

cmd/syncthing/monitor.go

@@ -17,8 +17,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 var (

cmd/syncthing/summarysvc.go

@@ -9,9 +9,9 @@ package main
 import (
 	"time"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/model"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/thejerf/suture"
 )
 

cmd/syncthing/upnpsvc.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/upnp"
+	"github.com/syncthing/syncthing/lib/upnp"
 )
 
 // The UPnP service runs a loop for discovery of IGDs (Internet Gateway

cmd/syncthing/usage_report.go

@@ -17,8 +17,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/model"
 	"github.com/thejerf/suture"
 )
 

cmd/syncthing/verbose.go

@@ -9,7 +9,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 // The verbose logging service subscribes to events and prints these in

lib/auto/auto_test.go

@@ -12,7 +12,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/syncthing/syncthing/internal/auto"
+	"github.com/syncthing/syncthing/lib/auto"
 )
 
 func TestAssets(t *testing.T) {

lib/config/config.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
 	"golang.org/x/crypto/bcrypt"
 )
 

lib/config/wrapper.go

@@ -10,9 +10,9 @@ import (
 	"os"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 // The Committer interface is implemented by objects that need to know about

lib/db/blockmap.go

@@ -19,9 +19,9 @@ import (
 	"sort"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/util"

lib/db/blockmap_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"

lib/db/concurrency_test.go

@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"

lib/db/leveldb.go

@@ -16,7 +16,7 @@ import (
 	"sort"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 	"github.com/syndtr/goleveldb/leveldb/opt"

lib/db/set.go

@@ -14,8 +14,8 @@ package db
 
 import (
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

lib/db/set_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )

lib/discover/client_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/syncthing/protocol"
 
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 var device protocol.DeviceID

lib/discover/client_udp.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 func init() {

lib/discover/discover.go

@@ -17,9 +17,9 @@ import (
 	"time"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/beacon"
+	"github.com/syncthing/syncthing/lib/beacon"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 type Discoverer struct {

lib/events/events.go

@@ -12,7 +12,7 @@ import (
 	stdsync "sync"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 type EventType int

lib/events/events_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 var timeout = 100 * time.Millisecond

lib/ignore/ignore.go

@@ -18,8 +18,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/fnmatch"
+	"github.com/syncthing/syncthing/lib/fnmatch"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 type Pattern struct {

lib/model/deviceactivity.go

@@ -8,7 +8,7 @@ package model
 
 import (
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 // deviceActivity tracks the number of outstanding requests per device and can

lib/model/folderstate.go

@@ -9,8 +9,8 @@ package model
 import (
 	"time"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 type folderState int

lib/model/model.go

@@ -23,16 +23,16 @@ import (
 	"time"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/ignore"
+	"github.com/syncthing/syncthing/lib/ignore"
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/internal/scanner"
+	"github.com/syncthing/syncthing/lib/scanner"
-	"github.com/syncthing/syncthing/internal/stats"
+	"github.com/syncthing/syncthing/lib/stats"
-	"github.com/syncthing/syncthing/internal/symlinks"
+	"github.com/syncthing/syncthing/lib/symlinks"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
-	"github.com/syncthing/syncthing/internal/versioner"
+	"github.com/syncthing/syncthing/lib/versioner"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/thejerf/suture"
 )

lib/model/model_test.go

@@ -19,8 +19,8 @@ import (
 	"time"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )

lib/model/progressemitter.go

@@ -12,9 +12,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 type ProgressEmitter struct {