Split .prepare step into .prepare-jsx and .prepare-go

This commit is contained in:
hmhealey
2015-11-30 09:56:53 -05:00
parent e5a2467c86
commit d31fc5ee10
2 changed files with 13 additions and 7 deletions

2
.gitignore vendored
View File

@@ -11,6 +11,8 @@ web/static/js/libs*.js
# Build Targets
.prepare
.prepare-go
.prepare-jsx
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o

View File

@@ -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