From cb83616943e04514d6c2b97254d0601dc637094e Mon Sep 17 00:00:00 2001 From: anonx Date: Sun, 4 Jan 2015 08:42:12 +0600 Subject: [PATCH 1/2] Do not override binaries in $GOPATH/bin (fix #819) --- harness/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harness/build.go b/harness/build.go index bee1fc2..74fa0ec 100755 --- a/harness/build.go +++ b/harness/build.go @@ -61,7 +61,7 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) { if err != nil { revel.ERROR.Fatalln("Failure importing", revel.ImportPath) } - binName := path.Join(pkg.BinDir, path.Base(revel.BasePath)) + binName := path.Join(pkg.BinDir, "revel.d", path.Base(revel.BasePath)) // Change binary path for Windows build goos := runtime.GOOS From 9066d60a5e314025b9c228fe0f9a034383908ea1 Mon Sep 17 00:00:00 2001 From: Eliseo Date: Sun, 18 Jan 2015 02:41:29 +0600 Subject: [PATCH 2/2] Using full import paths for revel binaries --- harness/build.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/harness/build.go b/harness/build.go index 74fa0ec..9470286 100755 --- a/harness/build.go +++ b/harness/build.go @@ -61,7 +61,9 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) { if err != nil { revel.ERROR.Fatalln("Failure importing", revel.ImportPath) } - binName := path.Join(pkg.BinDir, "revel.d", path.Base(revel.BasePath)) + + // Binary path is a combination of $GOBIN/revel.d directory, app's import path and its name. + binName := path.Join(pkg.BinDir, "revel.d", revel.ImportPath, path.Base(revel.BasePath)) // Change binary path for Windows build goos := runtime.GOOS