From 26b523e4a16ce99253b642a8354c3c7dbb865488 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 28 Mar 2018 14:54:58 -0700
Subject: Revert "add individual platform packaging targets (#8366)" (#8537)

This reverts commit f0f4f68defef1e9360394ba740c57cff7124dc9c.
---
 build/release.mk | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'build')

diff --git a/build/release.mk b/build/release.mk
index 568616ec3..e634b2dd4 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -32,7 +32,9 @@ build-client:
 
 	cd $(BUILD_WEBAPP_DIR) && $(MAKE) build
 
-package-common:
+package:
+	@ echo Packaging mattermost
+
 	@# Remove any old files
 	rm -Rf $(DIST_ROOT)
 
@@ -69,7 +71,9 @@ endif
 	cp NOTICE.txt $(DIST_PATH)
 	cp README.md $(DIST_PATH)
 
-package-osx: package-common
+	@# ----- PLATFORM SPECIFIC -----
+
+	@# Make osx package
 	@# Copy binary
 ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
 	cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
@@ -81,7 +85,7 @@ endif
 	@# Cleanup
 	rm -f $(DIST_PATH)/bin/platform
 
-package-windows: package-common
+	@# Make windows package
 	@# Copy binary
 ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
 	cp $(GOPATH)/bin/platform.exe $(DIST_PATH)/bin # from native bin dir, not cross-compiled
@@ -93,7 +97,7 @@ endif
 	@# Cleanup
 	rm -f $(DIST_PATH)/bin/platform.exe
 
-package-linux: package-common
+	@# Make linux package
 	@# Copy binary
 ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
 	cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
@@ -104,5 +108,3 @@ endif
 	tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-amd64.tar.gz mattermost
 	@# Don't clean up native package so dev machines will have an unzipped package available
 	@#rm -f $(DIST_PATH)/bin/platform
-
-package: package-linux package-windows package-osx
-- 
cgit v1.2.3-1-g7c22