mirror of https://github.com/beego/bee.git
Enable doc generation outside of gopath
This commit is contained in:
parent
d63a5eb53d
commit
2c21881cd7
|
@ -418,6 +418,11 @@ func analyseNSInclude(baseurl string, ce *ast.CallExpr) string {
|
||||||
return cname
|
return cname
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
func trimGithubPrefix(fullpath string) string {
|
||||||
|
return strings.Join(strings.Split(fullpath, "/")[3:], "/")
|
||||||
|
}
|
||||||
|
|
||||||
func analyseControllerPkg(vendorPath, localName, pkgpath string) {
|
func analyseControllerPkg(vendorPath, localName, pkgpath string) {
|
||||||
pkgpath = strings.Trim(pkgpath, "\"")
|
pkgpath = strings.Trim(pkgpath, "\"")
|
||||||
if isSystemPackage(pkgpath) {
|
if isSystemPackage(pkgpath) {
|
||||||
|
@ -433,12 +438,9 @@ func analyseControllerPkg(vendorPath, localName, pkgpath string) {
|
||||||
importlist[pps[len(pps)-1]] = pkgpath
|
importlist[pps[len(pps)-1]] = pkgpath
|
||||||
}
|
}
|
||||||
gopaths := bu.GetGOPATHs()
|
gopaths := bu.GetGOPATHs()
|
||||||
if len(gopaths) == 0 {
|
|
||||||
beeLogger.Log.Fatal("GOPATH environment variable is not set or empty")
|
|
||||||
}
|
|
||||||
pkgRealpath := ""
|
pkgRealpath := ""
|
||||||
|
|
||||||
wg, _ := filepath.EvalSymlinks(filepath.Join(vendorPath, pkgpath))
|
wg, _ := filepath.EvalSymlinks(filepath.Join(vendorPath, pkgpath))
|
||||||
|
wd, _ := os.Getwd()
|
||||||
if utils.FileExists(wg) {
|
if utils.FileExists(wg) {
|
||||||
pkgRealpath = wg
|
pkgRealpath = wg
|
||||||
} else {
|
} else {
|
||||||
|
@ -448,6 +450,13 @@ func analyseControllerPkg(vendorPath, localName, pkgpath string) {
|
||||||
if utils.FileExists(wg) {
|
if utils.FileExists(wg) {
|
||||||
pkgRealpath = wg
|
pkgRealpath = wg
|
||||||
break
|
break
|
||||||
|
} else {
|
||||||
|
trimmed := trimGithubPrefix(pkgpath)
|
||||||
|
wg, _ = filepath.EvalSymlinks(filepath.Join(wd, trimmed))
|
||||||
|
if utils.FileExists(wg) {
|
||||||
|
pkgRealpath = wg
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
4
main.go
4
main.go
|
@ -67,9 +67,7 @@ func main() {
|
||||||
|
|
||||||
config.LoadConfig()
|
config.LoadConfig()
|
||||||
|
|
||||||
// Check if current directory is inside the GOPATH,
|
if cmd.IfGenerateDocs(c.Name(), args) {
|
||||||
// if so parse the packages inside it.
|
|
||||||
if utils.IsInGOPATH(currentpath) && cmd.IfGenerateDocs(c.Name(), args) {
|
|
||||||
swaggergen.ParsePackagesFromDir(currentpath)
|
swaggergen.ParsePackagesFromDir(currentpath)
|
||||||
}
|
}
|
||||||
os.Exit(c.Run(c, args))
|
os.Exit(c.Run(c, args))
|
||||||
|
|
Loading…
Reference in New Issue