HTRACE-36. Fix build problem with bundler.go on fresh checkout (cmccabe)
diff --git a/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go b/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go
index 9a71eed..982dc8f 100644
--- a/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go
+++ b/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go
@@ -27,8 +27,8 @@
import (
"bufio"
+ "flag"
"fmt"
- "gopkg.in/alecthomas/kingpin.v1"
"io/ioutil"
"log"
"os"
@@ -176,12 +176,12 @@
return nil
}
+var src = flag.String("src", "", "Source path for bundled resources.")
+var dst = flag.String("dst", "", "Destination path for bundled resources.")
+var pkg = flag.String("pkg", "resource", "Package name to use for bundled resources")
+
func main() {
- app := kingpin.New("bundler", "The HTrace resource bundling build utility.")
- src := app.Flag("src", "Source path for bundled resources.").Default("").String()
- dst := app.Flag("dst", "Destination path for bundled resources.").Default("").String()
- pkg := app.Flag("pkg", "Package name to use for bundled resources.").Default("resource").String()
- kingpin.MustParse(app.Parse(os.Args[1:]))
+ flag.Parse()
if *src == "" {
log.Fatal("You must supply a src directory to bundle.")
}
@@ -209,12 +209,12 @@
return nil
})
if err != nil {
- log.Fatal("Error listing files in src directory %s: %s\n", absSrc, err.Error())
+ log.Fatalf("Error listing files in src directory %s: %s\n", absSrc, err.Error())
}
var dfiles []os.FileInfo
dfiles, err = ioutil.ReadDir(*dst)
if err != nil {
- log.Fatal("Error listing files in output directory %s: %s\n", *dst, err.Error())
+ log.Fatalf("Error listing files in output directory %s: %s\n", *dst, err.Error())
}
deleteUnusedDst(sfiles, *dst, dfiles)
for s := range sfiles {
@@ -223,6 +223,6 @@
log.Fatalf("Error creating bundle file for %s in %s: %s\n",
sfiles[s], *dst, err.Error())
}
- log.Printf("Bundled %s as %s\n", absSrc, absSrc + SEP + sfileToDfile(sfiles[s]))
+ log.Printf("Bundled %s as %s\n", absSrc, absSrc+SEP+sfileToDfile(sfiles[s]))
}
}
