From 53397ce11776c22a41444c841036ca61acd35521 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Wed, 11 Sep 2013 19:36:49 -0700 Subject: [PATCH] Add ./dev/... to multiple build targets. Adds ./dev/... to forcefull, full, & presubmit. Change-Id: I64d947b92dcda09ceb6bd2c536f1b698e2367cc0 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5e09f7dd4..46d169fdc 100644 --- a/Makefile +++ b/Makefile @@ -7,17 +7,17 @@ all: # On OS X with "brew install sqlite3", you need PKG_CONFIG_PATH=/usr/local/Cellar/sqlite/3.7.17/lib/pkgconfig/ full: - go install --ldflags="-X camlistore.org/pkg/buildinfo.GitInfo "`./misc/gitversion` `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./third_party/... + go install --ldflags="-X camlistore.org/pkg/buildinfo.GitInfo "`./misc/gitversion` `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./third_party/... ./dev/... # Workaround Go bug where the $GOPATH/pkg cache doesn't know about tag changes. # Useful when you accidentally run "make" and then "make presubmit" doesn't work. # See https://code.google.com/p/go/issues/detail?id=4443 forcefull: - go install -a --tags=with_sqlite ./pkg/... ./server/... ./cmd/... ./third_party/... + go install -a --tags=with_sqlite ./pkg/... ./server/... ./cmd/... ./third_party/... ./dev/... presubmit: - SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` -short ./pkg/... ./server/camlistored ./server/appengine ./cmd/... && echo PASS + SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` -short ./pkg/... ./server/camlistored ./server/appengine ./cmd/... ./dev/... && echo PASS embeds: go install ./pkg/fileembed/genfileembed/ && genfileembed ./server/camlistored/ui && genfileembed ./pkg/server