cmd/golangorg, internal: use newly copied x/website/internal packages
Now that the internal directory contains copies of the packages
from x/tools/godoc the import paths and dependencies can refer
to accessible files. The build now works for both the app engine
and non app engine configurations.
Updates golang/go#29206
Change-Id: I3ac8070b8a3c01d0ca40e3f5586d05fc9b5bb8ff
Reviewed-on: https://go-review.googlesource.com/c/159918
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
diff --git a/cmd/golangorg/appinit.go b/cmd/golangorg/appinit.go
index ca493a1..d535af8 100644
--- a/cmd/golangorg/appinit.go
+++ b/cmd/golangorg/appinit.go
@@ -23,15 +23,15 @@
"strings"
"golang.org/x/tools/godoc"
- "golang.org/x/tools/godoc/dl"
- "golang.org/x/tools/godoc/proxy"
- "golang.org/x/tools/godoc/redirect"
- "golang.org/x/tools/godoc/short"
"golang.org/x/tools/godoc/vfs"
"golang.org/x/tools/godoc/vfs/gatefs"
"golang.org/x/tools/godoc/vfs/mapfs"
"golang.org/x/tools/godoc/vfs/zipfs"
"golang.org/x/website/content/static"
+ "golang.org/x/website/internal/dl"
+ "golang.org/x/website/internal/proxy"
+ "golang.org/x/website/internal/redirect"
+ "golang.org/x/website/internal/short"
"cloud.google.com/go/datastore"
"golang.org/x/website/internal/memcache"
diff --git a/cmd/golangorg/blog.go b/cmd/golangorg/blog.go
index 42abeb6..219fec8 100644
--- a/cmd/golangorg/blog.go
+++ b/cmd/golangorg/blog.go
@@ -16,7 +16,7 @@
"sync"
"golang.org/x/tools/blog"
- "golang.org/x/tools/godoc/redirect"
+ "golang.org/x/website/internal/redirect"
)
const (
diff --git a/cmd/golangorg/handlers.go b/cmd/golangorg/handlers.go
index d393992..315c054 100644
--- a/cmd/golangorg/handlers.go
+++ b/cmd/golangorg/handlers.go
@@ -21,9 +21,9 @@
"text/template"
"golang.org/x/tools/godoc"
- "golang.org/x/tools/godoc/env"
- "golang.org/x/tools/godoc/redirect"
"golang.org/x/tools/godoc/vfs"
+ "golang.org/x/website/internal/env"
+ "golang.org/x/website/internal/redirect"
)
var (
diff --git a/go.mod b/go.mod
index f4a2677..4f4bc80 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@
golang.org/x/oauth2 v0.0.0-20190115181402-5dab4167f31c // indirect
golang.org/x/sys v0.0.0-20190124100055-b90733256f2e // indirect
golang.org/x/tools v0.0.0-20190124215303-cc6a436ffe6b
+ google.golang.org/appengine v1.4.0
google.golang.org/genproto v0.0.0-20190123001331-8819c946db44 // indirect
google.golang.org/grpc v1.18.0 // indirect
)
diff --git a/internal/dl/server.go b/internal/dl/server.go
index 43fa453..4501491 100644
--- a/internal/dl/server.go
+++ b/internal/dl/server.go
@@ -21,8 +21,8 @@
"time"
"cloud.google.com/go/datastore"
- "golang.org/x/tools/godoc/env"
- "golang.org/x/tools/internal/memcache"
+ "golang.org/x/website/internal/env"
+ "golang.org/x/website/internal/memcache"
)
type server struct {
diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
index bb0e81c..e465aab 100644
--- a/internal/proxy/proxy.go
+++ b/internal/proxy/proxy.go
@@ -18,7 +18,7 @@
"strings"
"time"
- "golang.org/x/tools/godoc/env"
+ "golang.org/x/website/internal/env"
)
const playgroundURL = "https://play.golang.org"
diff --git a/internal/redirect/redirect.go b/internal/redirect/redirect.go
index b4599f6..439a357 100644
--- a/internal/redirect/redirect.go
+++ b/internal/redirect/redirect.go
@@ -5,7 +5,7 @@
// Package redirect provides hooks to register HTTP handlers that redirect old
// godoc paths to their new equivalents and assist in accessing the issue
// tracker, wiki, code review system, etc.
-package redirect // import "golang.org/x/tools/godoc/redirect"
+package redirect // import "golang.org/x/website/internal/redirect"
import (
"context"
diff --git a/internal/short/short.go b/internal/short/short.go
index 3a399ab..69e82dc 100644
--- a/internal/short/short.go
+++ b/internal/short/short.go
@@ -23,7 +23,7 @@
"regexp"
"cloud.google.com/go/datastore"
- "golang.org/x/tools/internal/memcache"
+ "golang.org/x/website/internal/memcache"
"google.golang.org/appengine/user"
)
