cmd/golangorg: simplify local vs prod programs

There was too much duplicated code between main.go
and appinit.go and too many build-tagged-out files.

Make main.go the func main for both prod and local.
Introduce local.go, merging dl.go and play.go.
Introduce prod.go, holding the prod-specific bits of appinit.go
(the rest are in main.go).

Rename the build tag to prod instead of golangorg
(the whole program is golangorg; it's very confusing).

Fixes golang/go#41102.

Change-Id: I261ce8e9171110f01798025f8218ce9f8253af81
Reviewed-on: https://go-review.googlesource.com/c/website/+/293413
Trust: Russ Cox <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>

Author: rsc

README.md

@@ -8,7 +8,7 @@ Content is in _content/. Server code is in cmd/ and internal/.
 
 To run the server to preview local content changes, use:
 
-	go run ./cmd/golangorg -a
+	go run ./cmd/golangorg
 
 The supporting programs cmd/admingolangorg and cmd/googlegolangorg
 are the servers for admin.golang.org and google.golang.org.

cmd/golangorg/Dockerfile.prod

@@ -21,7 +21,7 @@ COPY . /website
 
 WORKDIR /website/cmd/golangorg
 
-RUN go build -o /golangorg -tags=golangorg golang.org/x/website/cmd/golangorg
+RUN go build -o /golangorg -tags=prod golang.org/x/website/cmd/golangorg
 
 # Clean up goroot for the final image.
 RUN cd /goroot && git clean -xdf

cmd/golangorg/README.md

@@ -16,10 +16,9 @@ To run in production mode locally, you need:
   * Godoc sources inside $GOPATH
     (`go get -d golang.org/x/website/cmd/golangorg`)
 
-Build with the `golangorg` tag and run:
+Run with the `prod` tag:
 
-	go build -tags golangorg
-	./golangorg
+	go run -tags prod .
 
 In production mode it serves on localhost:8080 (not 6060).
 The port is controlled by $PORT, as in:

cmd/golangorg/blog.go

@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.16
+// +build go1.16
+
 package main
 
 import (

cmd/golangorg/codewalk.go

@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.16
+// +build go1.16
+
 // The /doc/codewalk/ tree is synthesized from codewalk descriptions,
 // files named $GOROOT/doc/codewalk/*.xml.
 // For an example and a description of the format, see

cmd/golangorg/dl.go

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.16
 // +build !go1.16
 
 package main

cmd/golangorg/go115.go

@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.16
+// +build go1.16
+
 package main
 
 import (

cmd/golangorg/godoc.go

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.16
 // +build go1.16
 
 package main_test
@@ -77,14 +78,6 @@ func waitForServerReady(t *testing.T, addr string) {
 		false)
 }
 
-func waitForSearchReady(t *testing.T, addr string) {
-	waitForServer(t,
-		fmt.Sprintf("http://%v/search?q=FALLTHROUGH", addr),
-		"The list of tokens.",
-		2*time.Minute,
-		false)
-}
-
 func waitUntilScanComplete(t *testing.T, addr string) {
 	waitForServer(t,
 		fmt.Sprintf("http://%v/pkg", addr),

cmd/golangorg/godoc_test.go

@@ -2,13 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// The /doc/codewalk/ tree is synthesized from codewalk descriptions,
-// files named $GOROOT/doc/codewalk/*.xml.
-// For an example and a description of the format, see
-// http://golang.org/doc/codewalk/codewalk or run godoc -http=:6060
-// and see http://localhost:6060/doc/codewalk/codewalk .
-// That page is itself a codewalk; the source code for it is
-// $GOROOT/doc/codewalk/codewalk.xml.
+//go:build go1.16
+// +build go1.16
 
 package main
 

cmd/golangorg/goroot.go

@@ -0,0 +1,40 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.16 && !prod
+// +build go1.16,!prod
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"runtime"
+
+	// This package registers "/compile" and "/share" handlers
+	// that redirect to the golang.org playground.
+	_ "golang.org/x/tools/playground"
+)
+
+func earlySetup() {
+	_, file, _, ok := runtime.Caller(0)
+	if !ok {
+		fmt.Fprintln(os.Stderr, "runtime.Caller failed: cannot find templates for -a mode.")
+		os.Exit(2)
+	}
+	dir := filepath.Join(file, "../../../_content")
+	if _, err := os.Stat(filepath.Join(dir, "godoc.html")); err != nil {
+		log.Printf("warning: cannot find template dir; using embedded copy")
+		return
+	}
+	*templateDir = dir
+}
+
+func lateSetup(mux *http.ServeMux) {
+	// Register a redirect handler for /dl/ to the golang.org download page.
+	http.Handle("/dl/", http.RedirectHandler("https://golang.org/dl/", http.StatusFound))
+}