summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-12-06 10:49:34 -0500
committerGitHub <noreply@github.com>2016-12-06 10:49:34 -0500
commit026553e4f87bfc647a5c03129752e30fc523fa07 (patch)
treed5403c760151c0fa26fc6d020f7f4326ea9d6f8a /Makefile
parentdcf11a14d8363c79ab62aefca46834d6daa615ab (diff)
downloadchat-026553e4f87bfc647a5c03129752e30fc523fa07.tar.gz
chat-026553e4f87bfc647a5c03129752e30fc523fa07.tar.bz2
chat-026553e4f87bfc647a5c03129752e30fc523fa07.zip
Improving command line interface (#4689)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 8 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 4c7ce4bf1..454fae2d3 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ check-client-style:
check-server-style:
@echo Running GOFMT
- $(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ einterfaces/ mattermost.go 2>&1))
+ $(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ einterfaces/ cmd/platform/ 2>&1))
@echo "$(GOFMT_OUTPUT)"
@if [ ! "$(GOFMT_OUTPUT)" ]; then \
echo "gofmt sucess"; \
@@ -233,10 +233,7 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
endif
internal-test-web-client: start-docker prepare-enterprise
- $(GO) run $(GOFLAGS) *.go -run_web_client_tests
-
-internal-test-javascript-client: start-docker prepare-enterprise
- $(GO) run $(GOFLAGS) *.go -run_javascript_client_tests
+ $(GO) run $(GOFLAGS) ./cmd/platform/*go test web_client_tests
test-client: start-docker prepare-enterprise
@echo Running client tests
@@ -260,22 +257,22 @@ cover:
prepare-enterprise:
ifeq ($(BUILD_ENTERPRISE_READY),true)
@echo Enterprise build selected, preparing
- cp $(BUILD_ENTERPRISE_DIR)/imports.go .
+ cp $(BUILD_ENTERPRISE_DIR)/imports.go cmd/platform/
rm -f enterprise
ln -s $(BUILD_ENTERPRISE_DIR) enterprise
endif
build-linux: .prebuild prepare-enterprise
@echo Build Linux amd64
- env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) $(go list ./... | grep -v /vendor/)
+ env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
build-osx: .prebuild prepare-enterprise
@echo Build OSX amd64
- env GOOS=darwin GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) $(go list ./... | grep -v /vendor/)
+ env GOOS=darwin GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
build-windows: .prebuild prepare-enterprise
@echo Build Windows amd64
- env GOOS=windows GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) $(go list ./... | grep -v /vendor/)
+ env GOOS=windows GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
build: build-linux build-windows build-osx
@@ -360,13 +357,13 @@ run-server: prepare-enterprise start-docker
@echo Running mattermost for development
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
- $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) *.go &
+ $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform/*.go &
run-cli: prepare-enterprise start-docker
@echo Running mattermost for development
@echo Example should be like 'make ARGS="-version" run-cli'
- $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) *.go ${ARGS}
+ $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform/*.go ${ARGS}
run-client:
@echo Running mattermost client for development