qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 01:10:21 -07:00
Code Releases Activity

builder: minor fixes

Browse Source 
R=golang-dev, gri, bradfitz
CC=golang-dev
https://golang.org/cl/4634050
This commit is contained in:
Andrew Gerrand 2011-06-28 16:01:52 +10:00
parent 6282292f8d
commit 546c78b744
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
misc/dashboard/builder/package.go
View File

@ -10,7 +10,8 @@ import (
"go/token" "go/token"
"log" "log"
"os" "os"
"path" "path/filepath"
"strings"
) )
func (b *Builder) buildPackages(workpath string, hash string) os.Error { func (b *Builder) buildPackages(workpath string, hash string) os.Error {
@ -19,8 +20,8 @@ func (b *Builder) buildPackages(workpath string, hash string) os.Error {
return err return err
} }
for _, p := range pkgs { for _, p := range pkgs {
goroot := path.Join(workpath, "go") goroot := filepath.Join(workpath, "go")
goinstall := path.Join(goroot, "bin", "goinstall") goinstall := filepath.Join(goroot, "bin", "goinstall")
envv := append(b.envv(), "GOROOT="+goroot) envv := append(b.envv(), "GOROOT="+goroot)
// goinstall // goinstall
@ -29,10 +30,10 @@ func (b *Builder) buildPackages(workpath string, hash string) os.Error {
log.Printf("goinstall %v: %v", p, err) log.Printf("goinstall %v: %v", p, err)
continue continue
} }
built := code != 0 built := code == 0
// get doc comment from package source // get doc comment from package source
info, err := packageComment(p, path.Join(goroot, "pkg", p)) info, err := packageComment(p, filepath.Join(goroot, "pkg", p))
if err != nil { if err != nil {
log.Printf("goinstall %v: %v", p, err) log.Printf("goinstall %v: %v", p, err)
} }
@ -46,9 +47,15 @@ func (b *Builder) buildPackages(workpath string, hash string) os.Error {
return nil return nil
} }
func isGoFile(fi *os.FileInfo) bool {
return fi.IsRegular() && // exclude directories
!strings.HasPrefix(fi.Name, ".") && // ignore .files
filepath.Ext(fi.Name) == ".go"
}
func packageComment(pkg, pkgpath string) (info string, err os.Error) { func packageComment(pkg, pkgpath string) (info string, err os.Error) {
fset := token.NewFileSet() fset := token.NewFileSet()
pkgs, err := parser.ParseDir(fset, pkgpath, nil, parser.PackageClauseOnly|parser.ParseComments) pkgs, err := parser.ParseDir(fset, pkgpath, isGoFile, parser.PackageClauseOnly|parser.ParseComments)
if err != nil { if err != nil {
return return
} }