From 3bac3a006128ebcb4a6ea6dd5e2aa2f8614cb434 Mon Sep 17 00:00:00 2001 From: Jared Shields Date: Tue, 4 Oct 2016 08:56:01 -0400 Subject: Updated make files/scripts to accomodate execution/building in windows in addition to linux/mac (#4135) --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e3ed6e1a5..ba8321b67 100644 --- a/Makefile +++ b/Makefile @@ -377,22 +377,25 @@ run-fullmap: run-server run-client-fullmap stop-server: @echo Stopping mattermost +ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64") + wmic process where "Caption='go.exe' and CommandLine like '%go.exe run%'" call terminate + wmic process where "Caption='mattermost.exe' and CommandLine like '%go-build%'" call terminate +else @for PID in $$(ps -ef | grep "[g]o run" | awk '{ print $$2 }'); do \ echo stopping go $$PID; \ kill $$PID; \ done - @for PID in $$(ps -ef | grep "[g]o-build" | awk '{ print $$2 }'); do \ echo stopping mattermost $$PID; \ kill $$PID; \ done +endif stop-client: @echo Stopping mattermost client cd $(BUILD_WEBAPP_DIR) && $(MAKE) stop - stop: stop-server stop-client restart: restart-server restart-client -- cgit v1.2.3-1-g7c22