added --make-a-mess

README

@@ -192,6 +192,10 @@ Options:
  --gofmt
  		Run gofmt on all source for relevant targets.
 
+ --make-a-mess
+ 		Do not clean up intermediate files, such as .6/.8, the _cgo
+ 		directory and the _test directory.
+
  --testargs
  		All command line arguments that follow --testargs will be
  		passed on to the test binaries, and otherwise ignored.

gb/build.go

@@ -65,13 +65,14 @@ func BuildPackage(pkg *Package) (err error) {
 	if err != nil {
 		return
 	}
-
-	defer func() {
-		if Verbose {
-			fmt.Printf("Removing %s\n", filepath.Join(pkg.Dir, ibname))
-		}
-		os.Remove(filepath.Join(pkg.Dir, ibname))
-	}()
+	if !MakeAMess {
+		defer func() {
+			if Verbose {
+				fmt.Printf("Removing %s\n", filepath.Join(pkg.Dir, ibname))
+			}
+			os.Remove(filepath.Join(pkg.Dir, ibname))
+		}()
+	}
 
 	asmObjs := []string{}
 	for _, asm := range pkg.AsmSrcs {

gb/cgo.go

@@ -93,12 +93,14 @@ func BuildCgoPackage(pkg *Package) (err error) {
 		return
 	}
 
-	defer func() {
-		if Verbose {
-			fmt.Printf("Removing directory %s\n", cgodir)
-		}
-		os.RemoveAll(cgodir)
-	}()
+	if !MakeAMess {
+		defer func() {
+			if Verbose {
+				fmt.Printf("Removing directory %s\n", cgodir)
+			}
+			os.RemoveAll(cgodir)
+		}()
+	}
 
 	var cgobases []string
 

gb/doc.go

@@ -198,6 +198,10 @@ Options:
  --gofmt
  		Run gofmt on all source for relevant targets.
 
+ --make-a-mess
+ 		Do not clean up intermediate files, such as .6/.8, the _cgo
+ 		directory and the _test directory.
+
  --testargs
  		All command line arguments that follow --testargs will be
  		passed on to the test binaries, and otherwise ignored.

gb/gb.go

@@ -48,8 +48,9 @@ var Install, //-i
 	GoFix, //--gofix
 	DoPkgs, //-P
 	DoCmds, //-C
-	Distribution, //--dist
-	Workspace bool //--workspace
+	Distribution, //--dist (deprecated)
+	Workspace, //--workspace
+	MakeAMess bool //--make-a-mess
 
 var IncludeDir string
 var GCArgs []string
@@ -620,19 +621,24 @@ func CheckFlags() bool {
 			switch arg {
 			case "--gofmt":
 				GoFMT = true
+				HardArgs++
 			case "--gofix":
 				GoFix = true
+				HardArgs++
 			case "--dist":
 				Distribution = true
 			case "--makefiles":
 				GenMake = true
+				HardArgs++
 			case "--workspace":
 				Workspace = true
+				HardArgs++
+			case "--make-a-mess":
+				MakeAMess = true
 			default:
 				Usage()
 				return false
 			}
-			HardArgs++
 		} else if strings.HasPrefix(arg, "-") {
 			for _, flag := range arg[1:] {
 				switch flag {

gb/pkg.go

@@ -979,12 +979,14 @@ func (this *Package) Test() (err error) {
 	}
 
 	testdir := path.Join(this.Dir, "_test")
-	defer func() {
-		if Verbose {
-			fmt.Printf(" Removing %s\n", testdir)
-		}
-		err = os.RemoveAll(testdir)
-	}()
+	if !MakeAMess {
+		defer func() {
+			if Verbose {
+				fmt.Printf(" Removing %s\n", testdir)
+			}
+			err = os.RemoveAll(testdir)
+		}()
+	}
 
 	fmt.Printf("(in %s) testing \"%s\"\n", this.Dir, this.Target)
 

gb/usage.go

@@ -48,6 +48,8 @@ Options:
      generate standard makefiles without building
  --workspace
      create workspace.gb files in all directories
+ --make-a-mess
+     don't clean up intermediate files
  --testargs
      all arguments following --testargs are passed to the test binary
 `