godoc: update appinit.go, apply !appengine build constrain to main.go

R=adg, dsymonds
CC=golang-dev
https://golang.org/cl/5969063

diff --git a/src/cmd/godoc/appinit.go b/src/cmd/godoc/appinit.go
index 70da001100ad832ea948aae73269d7d9d74683d8..a4ae40bf29711e4af3c12f100330d28637607a1a 100644 (file)
--- a/src/cmd/godoc/appinit.go
+++ b/src/cmd/godoc/appinit.go
@@ -17,9 +17,12 @@ import (
 )
 
 func serveError(w http.ResponseWriter, r *http.Request, relpath string, err error) {
-       contents := applyTemplate(errorHTML, "errorHTML", err) // err may contain an absolute path!
        w.WriteHeader(http.StatusNotFound)
-       servePage(w, relpath, "File "+relpath, "", "", contents)
+       servePage(w, Page{
+               Title:    "File " + relpath,
+               Subtitle: relpath,
+               Body:     applyTemplate(errorHTML, "errorHTML", err), // err may contain an absolute path!
+       })
 }
 
 func init() {

diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go
index cb6e0530b92ffb2e8739769332d4dca7578d6a81..3efa349b5178b08f29b59e9f393638d3abfe7533 100644 (file)
--- a/src/cmd/godoc/main.go
+++ b/src/cmd/godoc/main.go
@@ -23,6 +23,8 @@
 //     godoc crypto/block Cipher NewCMAC
 //             - prints doc for Cipher and NewCMAC in package crypto/block
 
+// +build !appengine
+
 package main
 
 import (