summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 915eb4cea..305926e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GOFLAGS ?= $(GOFLAGS:)
BUILD_NUMBER ?= $(BUILD_NUMBER:)
GO=$(GOPATH)/bin/godep go
-ESLINT=web/react/node_modules/eslint/bin/eslint.js
+ESLINT=node_modules/eslint/bin/eslint.js
ifeq ($(BUILD_NUMBER),)
BUILD_NUMBER := dev
@@ -37,6 +37,9 @@ travis:
@cd web/react/ && npm install
+ @echo Checking for style guide compliance
+ cd web/react && $(ESLINT) --quiet components/* dispatcher/* pages/* stores/* utils/*
+
@$(GO) build $(GOFLAGS) ./...
@$(GO) install $(GOFLAGS) -a ./...
@@ -69,8 +72,6 @@ travis:
mkdir -p $(DIST_PATH)/api
cp -RL api/templates $(DIST_PATH)/api
- cp APACHE-2.0.txt $(DIST_PATH)
- cp GNU-AGPL-3.0.txt $(DIST_PATH)
cp LICENSE.txt $(DIST_PATH)
cp NOTICE.txt $(DIST_PATH)
cp README.md $(DIST_PATH)
@@ -105,11 +106,7 @@ install:
check: install
@echo Running ESLint...
- @$(ESLINT) web/react/components/*
- @$(ESLINT) web/react/dispatcher/*
- @$(ESLINT) web/react/pages/*
- @$(ESLINT) web/react/stores/*
- @$(ESLINT) web/react/utils/*
+ -cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
test: install
@mkdir -p logs
@@ -228,8 +225,6 @@ dist: install
mkdir -p $(DIST_PATH)/api
cp -RL api/templates $(DIST_PATH)/api
- cp APACHE-2.0.txt $(DIST_PATH)
- cp GNU-AGPL-3.0.txt $(DIST_PATH)
cp LICENSE.txt $(DIST_PATH)
cp NOTICE.txt $(DIST_PATH)
cp README.md $(DIST_PATH)