driving spike into build

Author: grantnelson-wf

build/build.go

@@ -916,7 +916,11 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, cwd string) erro
 		})
 	}
 
-	archive, err := s.BuildAndCompileProject(pkg)
+	parsed, err := s.BuildPackage(pkg)
+	if err != nil {
+		return err
+	}
+	archive, err := s.CompilePackage(parsed)
 	if err != nil {
 		return err
 	}
@@ -1053,32 +1057,18 @@ func (s *Session) CompilePackage(pkg *ParsedPackage) (*compiler.Archive, error)
 	return archive, nil
 }
 
-// BuildAndCompileProject builds and compiles a package.
-//
-// The package should be the entry point (main or tests) for a project.
-// This should not be called recursively because it expects all the dependencies
-// to be built prior to any part being compiled.
-func (s *Session) BuildAndCompileProject(pkg *PackageData) (*compiler.Archive, error) {
-	parsed, err := s.BuildPackage(pkg)
-	if err != nil {
-		return nil, err
-	}
-	return s.CompilePackage(parsed)
-}
-
 // ImportResolverFor returns a function which returns a compiled package archive
 // given an import path.
 func (s *Session) ImportResolverFor(srcDir string) func(string) (*compiler.Archive, error) {
 	return func(path string) (*compiler.Archive, error) {
 		if archive, ok := s.UpToDateArchives[path]; ok {
 			return archive, nil
 		}
-		_, parser, err := s.buildImportPathWithSrcDir(path, srcDir)
-		if err != nil {
-			return nil, err
+		// If the archive doesn't already exist, compile the parsed package.
+		if parsed, ok := s.ParsedPackages[path]; ok {
+			return s.CompilePackage(parsed)
 		}
-
-		return s.CompilePackage(parser)
+		return nil, fmt.Errorf(`parsed package for %q not found`, path)
 	}
 }
 

tool.go

@@ -147,7 +147,11 @@ func main() {
 					if err != nil {
 						return err
 					}
-					archive, err := s.BuildAndCompileProject(pkg)
+					parsed, err := s.BuildPackage(pkg)
+					if err != nil {
+						return err
+					}
+					archive, err := s.CompilePackage(parsed)
 					if err != nil {
 						return err
 					}
@@ -214,8 +218,11 @@ func main() {
 					if err != nil {
 						return err
 					}
-
-					archive, err := s.BuildAndCompileProject(pkg)
+					parsed, err := s.BuildPackage(pkg)
+					if err != nil {
+						return err
+					}
+					archive, err := s.CompilePackage(parsed)
 					if err != nil {
 						return err
 					}
@@ -664,7 +671,11 @@ func (fs serveCommandFileSystem) Open(requestName string) (http.File, error) {
 			buf := new(bytes.Buffer)
 			browserErrors := new(bytes.Buffer)
 			err := func() error {
-				archive, err := s.BuildAndCompileProject(pkg)
+				parsed, err := s.BuildPackage(pkg)
+				if err != nil {
+					return err
+				}
+				archive, err := s.CompilePackage(parsed)
 				if err != nil {
 					return err
 				}