修复 goroot.zip 打包工具, 支持指定翻译目录

Author: chai2010

appengine/main.go

@@ -14,6 +14,7 @@ package main
 
 import (
 	"archive/zip"
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -23,7 +24,27 @@ import (
 	"strings"
 )
 
+const (
+	GODOC_LOCAL_ROOT = "GODOC_LOCAL_ROOT"
+)
+
+var (
+	flagGoroot    = flag.String("goroot", runtime.GOROOT(), "Go root directory")
+	flagLocalRoot = flag.String("godoc-local-root", "", "Godoc translations root, default is $(GOROOT)/translations")
+)
+
 func main() {
+	flag.Parse()
+
+	if *flagLocalRoot == "" {
+		if s := os.Getenv(GODOC_LOCAL_ROOT); s != "" {
+			*flagLocalRoot = s
+		}
+	}
+	if *flagLocalRoot == "" || *flagLocalRoot == "translations" {
+		*flagLocalRoot = *flagGoroot + "/translations"
+	}
+
 	file, err := os.Create("goroot.zip")
 	if err != nil {
 		log.Fatal("os.Create: ", err)
@@ -41,21 +62,20 @@ func main() {
 	if _, err = f.Write([]byte("")); err != nil {
 		log.Fatal(err)
 	}
-
-	filepath.Walk(runtime.GOROOT(), func(path string, info os.FileInfo, err error) error {
+	filepath.Walk(*flagGoroot, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			log.Fatal("filepath.Walk: ", err)
 		}
 		if info.IsDir() {
 			return nil
 		}
-		relpath, err := filepath.Rel(runtime.GOROOT(), path)
+		relpath, err := filepath.Rel(*flagGoroot, path)
 		if err != nil {
 			log.Fatal("filepath.Rel: ", err)
 		}
 
 		filename := filepath.ToSlash(relpath)
-		if isIngoreFile(filename) {
+		if isIngoreFile(filename) || isTranslationsFile(filename) {
 			return nil
 		}
 
@@ -75,23 +95,73 @@ func main() {
 		fmt.Printf("%s\n", filename)
 		return nil
 	})
+
+	// create /goroot/translations/
+	f, err = zipFile.Create("goroot/translations/")
+	if err != nil {
+		log.Fatal(err)
+	}
+	if _, err = f.Write([]byte("")); err != nil {
+		log.Fatal(err)
+	}
+	filepath.Walk(*flagLocalRoot, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			log.Fatal("filepath.Walk: ", err)
+		}
+		if info.IsDir() {
+			return nil
+		}
+		relpath, err := filepath.Rel(*flagLocalRoot, path)
+		if err != nil {
+			log.Fatal("filepath.Rel: ", err)
+		}
+
+		filename := filepath.ToSlash(relpath)
+		if isIngoreFile(filename) {
+			return nil
+		}
+
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			log.Fatal("ioutil.ReadFile: ", err)
+		}
+
+		f, err := zipFile.Create("goroot/translations/" + filename)
+		if err != nil {
+			log.Fatal(err)
+		}
+		if _, err = f.Write(data); err != nil {
+			log.Fatal(err)
+		}
+
+		fmt.Printf("translations/%s\n", filename)
+		return nil
+	})
+
 	fmt.Printf("Done\n")
 }
 
+func isTranslationsFile(path string) bool {
+	if strings.HasPrefix(path, "translations") {
+		return true
+	}
+	return false
+}
+
 func isIngoreFile(path string) bool {
 	if strings.HasPrefix(path, "bin") {
 		return true
 	}
 	if strings.HasPrefix(path, "pkg") {
 		return true
 	}
-	if strings.HasPrefix(path, "translations/.git") {
+	if strings.HasPrefix(path, ".git") {
 		return true
 	}
-	if strings.HasPrefix(path, "translations/talks") {
+	if strings.HasPrefix(path, "talks") {
 		return true
 	}
-	if strings.HasPrefix(path, "translations/tour") {
+	if strings.HasPrefix(path, "tour") {
 		return true
 	}
 	switch strings.ToLower(filepath.Ext(path)) {

appinit.go

@@ -29,7 +29,7 @@ func init() {
 	log.Printf("index files = %s", flagIndexFilenames)
 
 	// Determine file system to use.
-	local.Init(flagZipGoroot, flagZipFilename, "", "")
+	local.Init(flagZipGoroot, local.Default, flagZipFilename, "", "")
 	fs.Bind("/", local.RootFS(), "/", vfs.BindReplace)
 	fs.Bind("/lib/godoc", local.StaticFS(*flagLang), "/", vfs.BindReplace)
 	fs.Bind("/doc", local.DocumentFS(*flagLang), "/", vfs.BindReplace)

main.go

@@ -82,7 +82,7 @@ var (
 	// file system roots
 	// TODO(gri) consider the invariant that goroot always end in '/'
 	flagGoroot    = flag.String("goroot", runtime.GOROOT(), "Go root directory")
-	flagLocalRoot = flag.String("godoc-local-root", "", "Godoc translates root, default is $(GOROOT)/translates")
+	flagLocalRoot = flag.String("godoc-local-root", "", "Godoc translations root, default is $(GOROOT)/translations")
 
 	// layout control
 	flagTabWidth       = flag.Int("tabwidth", 4, "tab width")