lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-24 13:30:53 +00:00
Code Issues Releases Activity

support go1.8 default gopath

Browse Source
This commit is contained in:
astaxie 2017-04-24 20:10:52 +08:00
parent 096cef1b6c
commit 3daa0d2639
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
generate/swaggergen/g_docs.go
View File

@ -36,6 +36,7 @@ import (
"github.com/astaxie/beego/swagger" "github.com/astaxie/beego/swagger"
"github.com/astaxie/beego/utils" "github.com/astaxie/beego/utils"
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
bu "github.com/beego/bee/utils"
) )
const ( const (
@ -141,7 +142,7 @@ func parsePackageFromDir(path string) error {
func GenerateDocs(curpath string) { func GenerateDocs(curpath string) {
fset := token.NewFileSet() fset := token.NewFileSet()
f, err := parser.ParseFile(fset, path.Join(curpath, "routers", "router.go"), nil, parser.ParseComments) f, err := parser.ParseFile(fset, filepath.Join(curpath, "routers", "router.go"), nil, parser.ParseComments)
if err != nil { if err != nil {
beeLogger.Log.Fatalf("Error while parsing router.go: %s", err) beeLogger.Log.Fatalf("Error while parsing router.go: %s", err)
} }
@ -350,8 +351,8 @@ func analyseControllerPkg(vendorPath, localName, pkgpath string) {
pps := strings.Split(pkgpath, "/") pps := strings.Split(pkgpath, "/")
importlist[pps[len(pps)-1]] = pkgpath importlist[pps[len(pps)-1]] = pkgpath
} }
gopath := os.Getenv("GOPATH") gopaths := bu.GetGOPATHs()
if gopath == "" { if len(gopaths) == 0 {
beeLogger.Log.Fatal("GOPATH environment variable is not set or empty") beeLogger.Log.Fatal("GOPATH environment variable is not set or empty")
} }
pkgRealpath := "" pkgRealpath := ""
@ -360,7 +361,7 @@ func analyseControllerPkg(vendorPath, localName, pkgpath string) {
if utils.FileExists(wg) { if utils.FileExists(wg) {
pkgRealpath = wg pkgRealpath = wg
} else { } else {
wgopath := filepath.SplitList(gopath) wgopath := gopaths
for _, wg := range wgopath { for _, wg := range wgopath {
wg, _ = filepath.EvalSymlinks(filepath.Join(wg, "src", pkgpath)) wg, _ = filepath.EvalSymlinks(filepath.Join(wg, "src", pkgpath))
if utils.FileExists(wg) { if utils.FileExists(wg) {

18
utils/utils.go
View File

@ -52,6 +52,9 @@ func IsExist(path string) bool {
// GetGOPATHs returns all paths in GOPATH variable. // GetGOPATHs returns all paths in GOPATH variable.
func GetGOPATHs() []string { func GetGOPATHs() []string {
gopath := os.Getenv("GOPATH") gopath := os.Getenv("GOPATH")
if gopath == "" && strings.Compare(runtime.Version(), "go1.8") >= 0 {
gopath = defaultGOPATH()
}
return filepath.SplitList(gopath) return filepath.SplitList(gopath)
} }
@ -61,7 +64,7 @@ func IsInGOPATH(thePath string) bool {
thePath = filepath.ToSlash(thePath) thePath = filepath.ToSlash(thePath)
} }
for _, gopath := range GetGOPATHs() { for _, gopath := range GetGOPATHs() {
if strings.Contains(thePath, gopath+"/src") { if strings.Contains(thePath, filepath.Join(gopath, "src")) {
return true return true
} }
} }
@ -425,3 +428,16 @@ func GetFileModTime(path string) int64 {
return fi.ModTime().Unix() return fi.ModTime().Unix()
} }
func defaultGOPATH() string {
env := "HOME"
if runtime.GOOS == "windows" {
env = "USERPROFILE"
} else if runtime.GOOS == "plan9" {
env = "home"
}
if home := os.Getenv(env); home != "" {
return filepath.Join(home, "go")
}
return ""
}