From 93b779f037014bc9ce568384c94a010d8eddf879 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 12 Jun 2013 08:55:41 -0700 Subject: [PATCH] make.go: don't put genjsdeps in bin/ Change-Id: If9244977c175d544b5e75f1229b0ed15e4c24f0c --- make.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/make.go b/make.go index 2e87e072e..6e86303d3 100644 --- a/make.go +++ b/make.go @@ -120,12 +120,16 @@ func main() { args = append(args, "--ldflags=-X camlistore.org/pkg/buildinfo.GitInfo "+version, "--tags="+tags, - "camlistore.org/pkg/...", - "camlistore.org/server/...", - "camlistore.org/third_party/...", "camlistore.org/cmd/camget", "camlistore.org/cmd/camput", "camlistore.org/cmd/camtool", + "camlistore.org/server/camlistored", + // Unnecessary, but to make sure we don't ship + // anything or copy anything into the fake GOPATH + // that's not needed or doesn't build: + "camlistore.org/pkg/...", + "camlistore.org/server/...", + "camlistore.org/third_party/...", ) switch runtime.GOOS { case "linux", "darwin": @@ -201,6 +205,7 @@ func mirrorDir(src, dst string) error { base := fi.Name() if fi.IsDir() { if base == "testdata" || base == "genfileembed" || + strings.HasSuffix(path, "pkg/misc/genjsdeps") || (base == "cmd" && strings.Contains(path, "github.com/camlistore/goexif")) { return filepath.SkipDir }