diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-17 12:04:51 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-17 12:04:51 -0400 |
| commit | a6a9dd76914b33d292a54d667ce6789c2b6b4b41 (patch) | |
| tree | a3a358fbb7cb8b272ce846965430276a4717ebfd /Makefile | |
| parent | 1fe2f7301a03f1051245fc38492c2ad4f5357de3 (diff) | |
| parent | fdc3207724fde8c0c3fae7e18d7ec8463e72e737 (diff) | |
| download | chat-a6a9dd76914b33d292a54d667ce6789c2b6b4b41.tar.gz chat-a6a9dd76914b33d292a54d667ce6789c2b6b4b41.tar.bz2 chat-a6a9dd76914b33d292a54d667ce6789c2b6b4b41.zip | |
Merge pull request #2462 from mattermost/plt-2340
PLT-2340 Webpack optimizations and fixes
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; \ |