diff options
author | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
commit | 5273559ca101d8ae4a55104f18081ab011e5068c (patch) | |
tree | f152b638101b224ffc59ed000e384b651915266a /Makefile | |
parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip |
Fixing merge
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -136,6 +136,7 @@ package: tar -C dist -czf $(DIST_PATH).tar.gz mattermost build-client: + mkdir -p webapp/dist/files cd webapp && make build go-test: @@ -196,15 +197,10 @@ clean: stop-docker rm -Rf $(DIST_ROOT) go clean $(GOFLAGS) -i ./... - rm -rf web/react/node_modules - rm -f web/static/js/bundle*.js - rm -f web/static/js/bundle*.js.map - rm -f web/static/js/libs*.js - rm -f web/static/css/styles.css + cd webapp && make clean rm -rf api/data rm -rf logs - rm -rf web/sass-files/.sass-cache rm -rf Godeps/_workspace/pkg/ @@ -220,14 +216,17 @@ nuke: | clean clean-docker touch $@ -run: start-docker run-server run-client +run: | start-docker run-client run-server run-server: .prepare-go @echo Starting go web server $(GO) run $(GOFLAGS) mattermost.go -config=config.json & -run-client: build-client - @echo Starting react processo +run-client: + @echo Starting client + + mkdir -p webapp/dist/files + cd webapp && make run @if [ "$(BUILD_ENTERPRISE)" = "true" ] && [ -d "$(ENTERPRISE_DIR)" ]; then \ cp ./config/config.json ./config/config.json.bak; \ |