changed signature of Session.WriteCommandPackage

neelance · neelance · commit 0e09744cc686 · 2016-02-25T00:32:06.000+01:00
diff --git a/build/build.go b/build/build.go
@@ -362,7 +362,7 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)
 	if pkgObj == "" {
 		pkgObj = filepath.Base(packagePath) + ".js"
 	}
-	if err := s.WriteCommandPackage(pkg, pkgObj); err != nil {
+	if err := s.WriteCommandPackage(pkg.Archive, pkgObj); err != nil {
 		return err
 	}
 	return nil
@@ -391,7 +391,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 	if s.Types["main"].Name() != "main" {
 		return fmt.Errorf("cannot build/run non-main package")
 	}
-	return s.WriteCommandPackage(pkg, pkgObj)
+	return s.WriteCommandPackage(pkg.Archive, pkgObj)
 }
 
 func (s *Session) BuildImportPath(path string) (*compiler.Archive, error) {
@@ -561,11 +561,7 @@ func (s *Session) writeLibraryPackage(pkg *PackageData, pkgObj string) error {
 	return compiler.WriteArchive(pkg.Archive, objFile)
 }
 
-func (s *Session) WriteCommandPackage(pkg *PackageData, pkgObj string) error {
-	if !pkg.IsCommand() || pkg.UpToDate {
-		return nil
-	}
-
+func (s *Session) WriteCommandPackage(archive *compiler.Archive, pkgObj string) error {
 	if err := os.MkdirAll(filepath.Dir(pkgObj), 0777); err != nil {
 		return err
 	}
@@ -592,7 +588,7 @@ func (s *Session) WriteCommandPackage(pkg *PackageData, pkgObj string) error {
 		sourceMapFilter.MappingCallback = NewMappingCallback(m, s.options.GOROOT, s.options.GOPATH)
 	}
 
-	deps, err := compiler.ImportDependencies(pkg.Archive, s.BuildImportPath)
+	deps, err := compiler.ImportDependencies(archive, s.BuildImportPath)
 	if err != nil {
 		return err
 	}
diff --git a/tool.go b/tool.go
@@ -130,7 +130,7 @@ func main() {
 					if pkgObj == "" {
 						pkgObj = filepath.Base(args[0]) + ".js"
 					}
-					if err := s.WriteCommandPackage(pkg, pkgObj); err != nil {
+					if err := s.WriteCommandPackage(pkg.Archive, pkgObj); err != nil {
 						return err
 					}
 				}
@@ -190,8 +190,10 @@ func main() {
 						return err
 					}
 					pkg := s.Packages[pkgPath]
-					if err := s.WriteCommandPackage(pkg, pkg.PkgObj); err != nil {
-						return err
+					if pkg.IsCommand() && !pkg.UpToDate {
+						if err := s.WriteCommandPackage(pkg.Archive, pkg.PkgObj); err != nil {
+							return err
+						}
 					}
 				}
 				return nil
@@ -406,7 +408,7 @@ func main() {
 					}
 				}()
 
-				if err := s.WriteCommandPackage(mainPkg, outfile.Name()); err != nil {
+				if err := s.WriteCommandPackage(mainPkg.Archive, outfile.Name()); err != nil {
 					return err
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)`
`362`	`362`	`if pkgObj == "" {`
`363`	`363`	`pkgObj = filepath.Base(packagePath) + ".js"`
`364`	`364`	`}`
`365`		`- if err := s.WriteCommandPackage(pkg, pkgObj); err != nil {`
	`365`	`+ if err := s.WriteCommandPackage(pkg.Archive, pkgObj); err != nil {`
`366`	`366`	`return err`
`367`	`367`	`}`
`368`	`368`	`return nil`
`@@ -391,7 +391,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri`
`391`	`391`	`if s.Types["main"].Name() != "main" {`
`392`	`392`	`return fmt.Errorf("cannot build/run non-main package")`
`393`	`393`	`}`
`394`		`- return s.WriteCommandPackage(pkg, pkgObj)`
	`394`	`+ return s.WriteCommandPackage(pkg.Archive, pkgObj)`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`func (s Session) BuildImportPath(path string) (compiler.Archive, error) {`
`@@ -561,11 +561,7 @@ func (s Session) writeLibraryPackage(pkg PackageData, pkgObj string) error {`
`561`	`561`	`return compiler.WriteArchive(pkg.Archive, objFile)`
`562`	`562`	`}`
`563`	`563`
`564`		`-func (s Session) WriteCommandPackage(pkg PackageData, pkgObj string) error {`
`565`		`- if !pkg.IsCommand() \|\| pkg.UpToDate {`
`566`		`- return nil`
`567`		`- }`
`568`		`-`
	`564`	`+func (s Session) WriteCommandPackage(archive compiler.Archive, pkgObj string) error {`
`569`	`565`	`if err := os.MkdirAll(filepath.Dir(pkgObj), 0777); err != nil {`
`570`	`566`	`return err`
`571`	`567`	`}`
`@@ -592,7 +588,7 @@ func (s Session) WriteCommandPackage(pkg PackageData, pkgObj string) error {`
`592`	`588`	`sourceMapFilter.MappingCallback = NewMappingCallback(m, s.options.GOROOT, s.options.GOPATH)`
`593`	`589`	`}`
`594`	`590`
`595`		`- deps, err := compiler.ImportDependencies(pkg.Archive, s.BuildImportPath)`
	`591`	`+ deps, err := compiler.ImportDependencies(archive, s.BuildImportPath)`
`596`	`592`	`if err != nil {`
`597`	`593`	`return err`
`598`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func main() {`
`130`	`130`	`if pkgObj == "" {`
`131`	`131`	`pkgObj = filepath.Base(args[0]) + ".js"`
`132`	`132`	`}`
`133`		`- if err := s.WriteCommandPackage(pkg, pkgObj); err != nil {`
	`133`	`+ if err := s.WriteCommandPackage(pkg.Archive, pkgObj); err != nil {`
`134`	`134`	`return err`
`135`	`135`	`}`
`136`	`136`	`}`
`@@ -190,8 +190,10 @@ func main() {`
`190`	`190`	`return err`
`191`	`191`	`}`
`192`	`192`	`pkg := s.Packages[pkgPath]`
`193`		`- if err := s.WriteCommandPackage(pkg, pkg.PkgObj); err != nil {`
`194`		`- return err`
	`193`	`+ if pkg.IsCommand() && !pkg.UpToDate {`
	`194`	`+ if err := s.WriteCommandPackage(pkg.Archive, pkg.PkgObj); err != nil {`
	`195`	`+ return err`
	`196`	`+ }`
`195`	`197`	`}`
`196`	`198`	`}`
`197`	`199`	`return nil`
`@@ -406,7 +408,7 @@ func main() {`
`406`	`408`	`}`
`407`	`409`	`}()`
`408`	`410`
`409`		`- if err := s.WriteCommandPackage(mainPkg, outfile.Name()); err != nil {`
	`411`	`+ if err := s.WriteCommandPackage(mainPkg.Archive, outfile.Name()); err != nil {`
`410`	`412`	`return err`
`411`	`413`	`}`
`412`	`414`