support for vendoring

neelance · neelance · commit f8510c9aef19 · 2016-02-20T20:04:58.000+01:00
diff --git a/build/build.go b/build/build.go
@@ -318,7 +318,7 @@ func NewSession(options *Options) *Session {
 		options:  options,
 		Packages: make(map[string]*PackageData),
 	}
-	s.Types = map[string]*types.Package{"unsafe": types.Unsafe}
+	s.Types = make(map[string]*types.Package)
 	if options.Watch {
 		if out, err := exec.Command("ulimit", "-n").Output(); err == nil {
 			if n, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil && n < 1024 {
diff --git a/compiler/package.go b/compiler/package.go
@@ -101,14 +101,20 @@ type packageImporter struct {
 }
 
 func (pi packageImporter) Import(path string) (*types.Package, error) {
-	if _, err := pi.importContext.Import(path); err != nil {
+	if path == "unsafe" {
+		return types.Unsafe, nil
+	}
+
+	a, err := pi.importContext.Import(path)
+	if err != nil {
 		if *pi.importError == nil {
 			// If import failed, show first error of import only (https://github.com/gopherjs/gopherjs/issues/119).
 			*pi.importError = err
 		}
 		return nil, err
 	}
-	return pi.importContext.Packages[path], nil
+
+	return a.types, nil
 }
 
 func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, importContext *ImportContext, minify bool) (*Archive, error) {
diff --git a/tests/misc_test.go b/tests/misc_test.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 	"time"
+	"vendored"
 
 	"github.com/gopherjs/gopherjs/tests/otherpkg"
 )
@@ -502,3 +503,9 @@ func TestGoexit(t *testing.T) {
 		runtime.Goexit()
 	}()
 }
+
+func TestVendoring(t *testing.T) {
+	if vendored.Answer != 42 {
+		t.Fail()
+	}
+}
diff --git a/tests/vendor/vendored/vendored.go b/tests/vendor/vendored/vendored.go
@@ -0,0 +1,3 @@
+package vendored
+
+var Answer = 42

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ func NewSession(options Options) Session {`
`318`	`318`	`options: options,`
`319`	`319`	`Packages: make(map[string]*PackageData),`
`320`	`320`	`}`
`321`		`- s.Types = map[string]*types.Package{"unsafe": types.Unsafe}`
	`321`	`+ s.Types = make(map[string]*types.Package)`
`322`	`322`	`if options.Watch {`
`323`	`323`	`if out, err := exec.Command("ulimit", "-n").Output(); err == nil {`
`324`	`324`	`if n, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil && n < 1024 {`
Original file line number	Diff line number	Diff line change
`@@ -101,14 +101,20 @@ type packageImporter struct {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (pi packageImporter) Import(path string) (*types.Package, error) {`
`104`		`- if _, err := pi.importContext.Import(path); err != nil {`
	`104`	`+ if path == "unsafe" {`
	`105`	`+ return types.Unsafe, nil`
	`106`	`+ }`
	`107`	`+`
	`108`	`+ a, err := pi.importContext.Import(path)`
	`109`	`+ if err != nil {`
`105`	`110`	`if *pi.importError == nil {`
`106`	`111`	`// If import failed, show first error of import only (https://github.com/gopherjs/gopherjs/issues/119).`
`107`	`112`	`*pi.importError = err`
`108`	`113`	`}`
`109`	`114`	`return nil, err`
`110`	`115`	`}`
`111`		`- return pi.importContext.Packages[path], nil`
	`116`	`+`
	`117`	`+ return a.types, nil`
`112`	`118`	`}`
`113`	`119`
`114`	`120`	`func Compile(importPath string, files []ast.File, fileSet token.FileSet, importContext ImportContext, minify bool) (Archive, error) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package vendored`
	`2`	`+`
	`3`	`+var Answer = 42`