f9706f970f
This CL uses go/build.Default.GOPATH to infer the correct value for $GOPATH at build time. Previously, pkgDir would fail if somebody were to build and test containous/gi from a different GOPATH location (e.g. GOPATH=/build/go)
63 lines
1.2 KiB
Go
63 lines
1.2 KiB
Go
package interp
|
|
|
|
import (
|
|
"go/build"
|
|
"io/ioutil"
|
|
"log"
|
|
"os"
|
|
"path/filepath"
|
|
)
|
|
|
|
func (interp *Interpreter) importSrcFile(path string) {
|
|
/*
|
|
//basedir := os.Getenv("HOME") + "/go/src/"
|
|
basedir, err := filepath.Abs(filepath.Dir(os.Args[0]))
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
dir := basedir + "/vendor/" + path
|
|
*/
|
|
dir := pkgDir(path)
|
|
files, err := ioutil.ReadDir(dir)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
for _, file := range files {
|
|
name := file.Name()
|
|
if len(name) <= 3 || name[len(name)-3:] != ".go" {
|
|
continue
|
|
}
|
|
if len(name) > 8 && name[len(name)-8:] == "_test.go" {
|
|
continue
|
|
}
|
|
buf, err := ioutil.ReadFile(dir + "/" + name)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
pkgName, sdef := interp.Eval(string(buf))
|
|
if interp.srcPkg[pkgName] == nil {
|
|
s := make(NodeMap)
|
|
interp.srcPkg[pkgName] = &s
|
|
}
|
|
for name, node := range *sdef {
|
|
(*interp.srcPkg[pkgName])[name] = node
|
|
}
|
|
}
|
|
}
|
|
|
|
func pkgDir(path string) string {
|
|
dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
dir += "/vendor/" + path
|
|
if _, err := os.Stat(dir); err == nil {
|
|
return dir
|
|
}
|
|
dir = filepath.Join(build.Default.GOPATH, "src", path)
|
|
if _, err := os.Stat(dir); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
return dir
|
|
}
|