Update import paths after move from tools repo
Also:
- Move the watcher to cmd/watcher (somehow this was missed earlier).
- Move dashboard package from the repo root to its own directory.
- Update docker build scripts. (Although not yet the version hashes in
the Dockerfiles; this leaves the docker builds broken, but they were
already broken after moving the builder to cmd/builder. They'll be
fixed in a followup CL after this one is submitted.)
Change-Id: I29a9758da1f3c60446e3ce18174c0df26e4d8325
Reviewed-on: https://go-review.googlesource.com/3077
Reviewed-by: Andrew Gerrand <adg@golang.org>
diff --git a/app/build/ui.go b/app/build/ui.go
index 76be930..1f70636 100644
--- a/app/build/ui.go
+++ b/app/build/ui.go
@@ -21,7 +21,7 @@
"strconv"
"strings"
- "golang.org/x/tools/dashboard/types"
+ "golang.org/x/build/types"
"cache"
diff --git a/buildlet/buildletclient.go b/buildlet/buildletclient.go
index 53b2c6a..4d1e2c1 100644
--- a/buildlet/buildletclient.go
+++ b/buildlet/buildletclient.go
@@ -6,7 +6,7 @@
// Package buildlet contains client tools for working with a buildlet
// server.
-package buildlet // import "golang.org/x/tools/dashboard/buildlet"
+package buildlet // import "golang.org/x/build/buildlet"
import (
"errors"
diff --git a/buildlet/gce.go b/buildlet/gce.go
index 3bd1d92..a7ae477 100644
--- a/buildlet/gce.go
+++ b/buildlet/gce.go
@@ -14,8 +14,8 @@
"strings"
"time"
+ "golang.org/x/build/dashboard"
"golang.org/x/oauth2"
- "golang.org/x/tools/dashboard"
"google.golang.org/api/compute/v1"
)
diff --git a/cmd/builder/doc.go b/cmd/builder/doc.go
index 15b7252..f88dc7b 100644
--- a/cmd/builder/doc.go
+++ b/cmd/builder/doc.go
@@ -55,4 +55,4 @@
will be skipped.
*/
-package main // import "golang.org/x/tools/dashboard/cmd/builder"
+package main // import "golang.org/x/build/cmd/builder"
diff --git a/cmd/buildlet/buildlet.go b/cmd/buildlet/buildlet.go
index 95cc2ba..6c5cfc8 100644
--- a/cmd/buildlet/buildlet.go
+++ b/cmd/buildlet/buildlet.go
@@ -12,7 +12,7 @@
// provides no security of its own. It is assumed that any user uses
// it with an appropriately-configured firewall between their VM
// instances.
-package main // import "golang.org/x/tools/dashboard/cmd/buildlet"
+package main // import "golang.org/x/build/cmd/buildlet"
import (
"archive/tar"
diff --git a/cmd/coordinator/buildongce/create.go b/cmd/coordinator/buildongce/create.go
index a6755bd..6e4be8b 100644
--- a/cmd/coordinator/buildongce/create.go
+++ b/cmd/coordinator/buildongce/create.go
@@ -4,7 +4,7 @@
// +build extdep
-package main // import "golang.org/x/tools/dashboard/cmd/coordinator/buildongce"
+package main // import "golang.org/x/build/cmd/coordinator/buildongce"
import (
"bufio"
diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
index 900b848..e94ceca 100644
--- a/cmd/coordinator/coordinator.go
+++ b/cmd/coordinator/coordinator.go
@@ -5,7 +5,7 @@
// +build extdep
// The coordinator runs on GCE and coordinates builds in Docker containers.
-package main // import "golang.org/x/tools/dashboard/cmd/coordinator"
+package main // import "golang.org/x/build/cmd/coordinator"
import (
"archive/tar"
@@ -33,11 +33,11 @@
"sync"
"time"
+ "golang.org/x/build/buildlet"
+ "golang.org/x/build/dashboard"
+ "golang.org/x/build/types"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
- "golang.org/x/tools/dashboard"
- "golang.org/x/tools/dashboard/buildlet"
- "golang.org/x/tools/dashboard/types"
"google.golang.org/api/compute/v1"
"google.golang.org/cloud/compute/metadata"
)
diff --git a/cmd/gomote/auth.go b/cmd/gomote/auth.go
index 56ca0d4..f997ef3 100644
--- a/cmd/gomote/auth.go
+++ b/cmd/gomote/auth.go
@@ -13,9 +13,9 @@
"path/filepath"
"runtime"
+ "golang.org/x/build/auth"
+ "golang.org/x/build/buildlet"
"golang.org/x/oauth2"
- "golang.org/x/tools/dashboard/auth"
- "golang.org/x/tools/dashboard/buildlet"
"google.golang.org/api/compute/v1"
)
diff --git a/cmd/gomote/create.go b/cmd/gomote/create.go
index 31806af..290ce61 100644
--- a/cmd/gomote/create.go
+++ b/cmd/gomote/create.go
@@ -15,8 +15,8 @@
"strings"
"time"
- "golang.org/x/tools/dashboard"
- "golang.org/x/tools/dashboard/buildlet"
+ "golang.org/x/build/buildlet"
+ "golang.org/x/build/dashboard"
)
func create(args []string) error {
diff --git a/cmd/gomote/destroy.go b/cmd/gomote/destroy.go
index 1f758ef..4416374 100644
--- a/cmd/gomote/destroy.go
+++ b/cmd/gomote/destroy.go
@@ -14,7 +14,7 @@
"os"
"time"
- "golang.org/x/tools/dashboard/buildlet"
+ "golang.org/x/build/buildlet"
)
func destroy(args []string) error {
diff --git a/cmd/gomote/list.go b/cmd/gomote/list.go
index c410f12..868afbd 100644
--- a/cmd/gomote/list.go
+++ b/cmd/gomote/list.go
@@ -12,7 +12,7 @@
"os"
"strings"
- "golang.org/x/tools/dashboard/buildlet"
+ "golang.org/x/build/buildlet"
)
func list(args []string) error {
diff --git a/cmd/gomote/run.go b/cmd/gomote/run.go
index ff2d47c..7b1e7b9 100644
--- a/cmd/gomote/run.go
+++ b/cmd/gomote/run.go
@@ -12,7 +12,7 @@
"os"
"strings"
- "golang.org/x/tools/dashboard/buildlet"
+ "golang.org/x/build/buildlet"
)
func run(args []string) error {
diff --git a/cmd/upload/upload.go b/cmd/upload/upload.go
index 087be49..d7f284b 100644
--- a/cmd/upload/upload.go
+++ b/cmd/upload/upload.go
@@ -20,8 +20,8 @@
"os"
"strings"
+ "golang.org/x/build/auth"
"golang.org/x/oauth2"
- "golang.org/x/tools/dashboard/auth"
"google.golang.org/cloud"
"google.golang.org/cloud/storage"
)
diff --git a/watcher/watcher.go b/cmd/watcher/watcher.go
similarity index 99%
rename from watcher/watcher.go
rename to cmd/watcher/watcher.go
index f29d5a5..69ff742 100644
--- a/watcher/watcher.go
+++ b/cmd/watcher/watcher.go
@@ -4,7 +4,7 @@
// Command watcher watches the specified repository for new commits
// and reports them to the build dashboard.
-package main // import "golang.org/x/tools/dashboard/watcher"
+package main // import "golang.org/x/build/cmd/watcher"
import (
"bufio"
diff --git a/builders.go b/dashboard/builders.go
similarity index 100%
rename from builders.go
rename to dashboard/builders.go
diff --git a/builders_test.go b/dashboard/builders_test.go
similarity index 100%
rename from builders_test.go
rename to dashboard/builders_test.go
diff --git a/env/commit-watcher/scripts/build-commit-watcher.sh b/env/commit-watcher/scripts/build-commit-watcher.sh
index ca03b41..1a61eaf 100755
--- a/env/commit-watcher/scripts/build-commit-watcher.sh
+++ b/env/commit-watcher/scripts/build-commit-watcher.sh
@@ -4,7 +4,8 @@
export GOROOT=/goroot
PREFIX=/usr/local
: ${GO_REV:?"need to be set to the golang repo revision used to build the commit watcher."}
-: ${WATCHER_REV:?"need to be set to the go.tools repo revision for the commit watcher."}
+: ${TOOLS_REV:?"need to be set to the tools repo revision used to build the commit watcher."}
+: ${WATCHER_REV:?"need to be set to the build repo revision for the commit watcher."}
mkdir -p $GOROOT
git clone https://go.googlesource.com/go $GOROOT
@@ -13,8 +14,13 @@
GO_TOOLS=$GOPATH/src/golang.org/x/tools
mkdir -p $GO_TOOLS
git clone https://go.googlesource.com/tools $GO_TOOLS
+(cd $GO_TOOLS && git reset --hard $TOOLS_REV)
+
+GO_BUILD=$GOPATH/src/golang.org/x/build
+mkdir -p $GO_BUILD
+git clone https://go.googlesource.com/build $GO_BUILD
mkdir -p $PREFIX/bin
-(cd $GO_TOOLS && git reset --hard $WATCHER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/watcher)
+(cd $GO_BUILD && git reset --hard $WATCHER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/build/cmd/watcher)
rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH
diff --git a/env/linux-x86-base/scripts/build-go-builder.sh b/env/linux-x86-base/scripts/build-go-builder.sh
index 13b7d73..4f06f1b 100755
--- a/env/linux-x86-base/scripts/build-go-builder.sh
+++ b/env/linux-x86-base/scripts/build-go-builder.sh
@@ -4,7 +4,8 @@
export GOROOT=/goroot
PREFIX=/usr/local
: ${GO_REV:?"need to be set to the golang repo revision used to build the builder."}
-: ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."}
+: ${TOOLS_REV:?"need to be set to the tools repo revision used to build the builder."}
+: ${BUILDER_REV:?"need to be set to the build repo revision for the builder."}
mkdir -p $GOROOT
git clone https://go.googlesource.com/go $GOROOT
@@ -13,9 +14,14 @@
GO_TOOLS=$GOPATH/src/golang.org/x/tools
mkdir -p $GO_TOOLS
git clone https://go.googlesource.com/tools $GO_TOOLS
+(cd $GO_TOOLS && git reset --hard $TOOLS_REV)
+
+GO_BUILD=$GOPATH/src/golang.org/x/build
+mkdir -p $GO_BUILD
+git clone https://go.googlesource.com/build $GO_BUILD
mkdir -p $PREFIX/bin
-(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder)
+(cd $GO_BUILD && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/build/cmd/builder)
rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH
diff --git a/env/linux-x86-clang/scripts/build-go-builder.sh b/env/linux-x86-clang/scripts/build-go-builder.sh
index 13b7d73..4f06f1b 100755
--- a/env/linux-x86-clang/scripts/build-go-builder.sh
+++ b/env/linux-x86-clang/scripts/build-go-builder.sh
@@ -4,7 +4,8 @@
export GOROOT=/goroot
PREFIX=/usr/local
: ${GO_REV:?"need to be set to the golang repo revision used to build the builder."}
-: ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."}
+: ${TOOLS_REV:?"need to be set to the tools repo revision used to build the builder."}
+: ${BUILDER_REV:?"need to be set to the build repo revision for the builder."}
mkdir -p $GOROOT
git clone https://go.googlesource.com/go $GOROOT
@@ -13,9 +14,14 @@
GO_TOOLS=$GOPATH/src/golang.org/x/tools
mkdir -p $GO_TOOLS
git clone https://go.googlesource.com/tools $GO_TOOLS
+(cd $GO_TOOLS && git reset --hard $TOOLS_REV)
+
+GO_BUILD=$GOPATH/src/golang.org/x/build
+mkdir -p $GO_BUILD
+git clone https://go.googlesource.com/build $GO_BUILD
mkdir -p $PREFIX/bin
-(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder)
+(cd $GO_BUILD && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/build/cmd/builder)
rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH
diff --git a/env/linux-x86-nacl/scripts/build-go-builder.sh b/env/linux-x86-nacl/scripts/build-go-builder.sh
index 8cf9c27..a735147 100755
--- a/env/linux-x86-nacl/scripts/build-go-builder.sh
+++ b/env/linux-x86-nacl/scripts/build-go-builder.sh
@@ -4,7 +4,8 @@
export GOROOT=/goroot
PREFIX=/usr/local
: ${GO_REV:?"need to be set to the golang repo revision used to build the builder."}
-: ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."}
+: ${TOOLS_REV:?"need to be set to the tools repo revision used to build the builder."}
+: ${BUILDER_REV:?"need to be set to the build repo revision for the builder."}
mkdir -p $GOROOT
git clone https://go.googlesource.com/go $GOROOT
@@ -13,9 +14,14 @@
GO_TOOLS=$GOPATH/src/golang.org/x/tools
mkdir -p $GO_TOOLS
git clone https://go.googlesource.com/tools $GO_TOOLS
+(cd $GO_TOOLS && git reset --hard $TOOLS_REV)
+
+GO_BUILD=$GOPATH/src/golang.org/x/build
+mkdir -p $GO_BUILD
+git clone https://go.googlesource.com/build $GO_BUILD
mkdir -p $PREFIX/bin
-(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder)
+(cd $GO_BUILD && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/build/cmd/builder)
rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH
diff --git a/env/linux-x86-sid/scripts/build-go-builder.sh b/env/linux-x86-sid/scripts/build-go-builder.sh
index 13b7d73..4f06f1b 100755
--- a/env/linux-x86-sid/scripts/build-go-builder.sh
+++ b/env/linux-x86-sid/scripts/build-go-builder.sh
@@ -4,7 +4,8 @@
export GOROOT=/goroot
PREFIX=/usr/local
: ${GO_REV:?"need to be set to the golang repo revision used to build the builder."}
-: ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."}
+: ${TOOLS_REV:?"need to be set to the tools repo revision used to build the builder."}
+: ${BUILDER_REV:?"need to be set to the build repo revision for the builder."}
mkdir -p $GOROOT
git clone https://go.googlesource.com/go $GOROOT
@@ -13,9 +14,14 @@
GO_TOOLS=$GOPATH/src/golang.org/x/tools
mkdir -p $GO_TOOLS
git clone https://go.googlesource.com/tools $GO_TOOLS
+(cd $GO_TOOLS && git reset --hard $TOOLS_REV)
+
+GO_BUILD=$GOPATH/src/golang.org/x/build
+mkdir -p $GO_BUILD
+git clone https://go.googlesource.com/build $GO_BUILD
mkdir -p $PREFIX/bin
-(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder)
+(cd $GO_BUILD && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/build/cmd/builder)
rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH
