cmd/golangorg: use go/doc instead of x/website/content/doc

This is the first step towards deduplicating the doc folder so
that any changes in go/doc don't have to be backported to
the x/website repo. In the long term, the doc folder will
ultimately live in x/website, but that will be prioritized later
once x/tools has had website related code properly moved to
x/website.

Updates golang/go#29206

Change-Id: I1c5d200e9e72d3e24bc87f79e1d34faa8c9af36b
Reviewed-on: https://go-review.googlesource.com/c/160237
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
This commit is contained in:
Channing Kimble-Brown 2019-01-29 13:48:03 -05:00
Родитель 6e81c213a8
Коммит 902c675d52
2 изменённых файлов: 0 добавлений и 7 удалений

Просмотреть файл

@ -77,9 +77,6 @@ func main() {
fs.Bind("/lib/godoc", mapfs.New(static.Files), "/", vfs.BindReplace)
docPath := getFullPath("/src/golang.org/x/website/content/doc")
fs.Bind("/doc", gatefs.New(vfs.OS(docPath), fsGate), "/", vfs.BindBefore)
webroot := getFullPath("/src/golang.org/x/website")
fs.Bind("/favicon.ico", gatefs.New(vfs.OS(webroot), fsGate), "/favicon.ico", vfs.BindBefore)

Просмотреть файл

@ -213,10 +213,6 @@ func main() {
fs.Bind("/src", gatefs.New(vfs.OS(p), fsGate), "/src", vfs.BindAfter)
}
// adding ability to specify local doc directory
docPath := getFullPath("/src/golang.org/x/website/content/doc")
fs.Bind("/doc", gatefs.New(vfs.OS(docPath), fsGate), "/", vfs.BindBefore)
webroot := getFullPath("/src/golang.org/x/website")
fs.Bind("/robots.txt", gatefs.New(vfs.OS(webroot), fsGate), "/robots.txt", vfs.BindBefore)
fs.Bind("/favicon.ico", gatefs.New(vfs.OS(webroot), fsGate), "/favicon.ico", vfs.BindBefore)