From e5a2467c860fc8a40108edb968e82253abcb4ea1 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Fri, 27 Nov 2015 16:36:57 -0500
Subject: Added .prepare step to make test

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 87219e68c..06f14c31d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ dist: | build-server build-client go-test package
 	mv ./model/version.go.bak ./model/version.go
 
 dist-local: | start-docker dist
-	
+
 dist-travis: | travis-init build-container
 
 start-docker:
@@ -153,7 +153,7 @@ go-test:
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1
 
-test: | start-docker go-test
+test: | start-docker .prepare go-test
 
 travis-init:
 	@echo Setting up enviroment for travis
-- 
cgit v1.2.3-1-g7c22


From d31fc5ee10965d9c45e0e0f755607f6a46a9ba6d Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 30 Nov 2015 09:56:53 -0500
Subject: Split .prepare step into .prepare-jsx and .prepare-go

---
 Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 06f14c31d..098422052 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ go-test:
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1
 
-test: | start-docker .prepare go-test
+test: | start-docker .prepare-go go-test
 
 travis-init:
 	@echo Setting up enviroment for travis
@@ -217,25 +217,29 @@ clean: stop-docker
 	rm -rf Godeps/_workspace/pkg/
 
 	rm -f mattermost.log
-	rm -f .prepare
+	rm -f .prepare-go .prepare-jsx
 
 nuke: | clean clean-docker
 	rm -rf data
 
-.prepare:
-	@echo Preparation for run step
-
+.prepare-go:
+	@echo Preparation for running go code
 	go get $(GOFLAGS) github.com/tools/godep
 
+	touch $@
+
+.prepare-jsx:
+	@echo Preparation for compiling jsx code
+
 	cd web/react/ && npm install
 	cd web/react/ && npm run build-libs
 
 	touch $@
 
-run: start-docker .prepare
+run: start-docker .prepare-go .prepare-jsx
 	mkdir -p web/static/js
 
-	@echo Starting react processor	
+	@echo Starting react processo
 	cd web/react && npm start &
 
 	@echo Starting go web server
-- 
cgit v1.2.3-1-g7c22