IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix ee make targets (#7828)

Browse Source
This commit is contained in:
Chris
2017-11-14 13:13:31 -06:00
committed by GitHub
parent d4208cda19
commit 1c92ad0afb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@@ -69,18 +69,9 @@ TESTFLAGS ?= -short
TESTFLAGSEE ?= -short TESTFLAGSEE ?= -short
# Packages lists # Packages lists
TE_PACKAGES=$(shell go list ./... | grep -v vendor) TE_PACKAGES=$(shell go list ./...)
TE_PACKAGES_COMMA=$(shell echo $(TE_PACKAGES) | tr ' ' ',') TE_PACKAGES_COMMA=$(shell echo $(TE_PACKAGES) | tr ' ' ',')
EE_PACKAGES=$(shell go list ./enterprise/... | grep -v vendor | tail -n +2)
EE_PACKAGES_COMMA=$(shell echo $(EE_PACKAGES) | tr ' ' ',')
ifeq ($(BUILD_ENTERPRISE_READY),true)
ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA),$(EE_PACKAGES_COMMA)
else
ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA)
endif
# Prepares the enterprise build if exists. The IGNORE stuff is a hack to get the Makefile to execute the commands outside a target # Prepares the enterprise build if exists. The IGNORE stuff is a hack to get the Makefile to execute the commands outside a target
ifeq ($(BUILD_ENTERPRISE_READY),true) ifeq ($(BUILD_ENTERPRISE_READY),true)
IGNORE:=$(shell echo Enterprise build selected, preparing) IGNORE:=$(shell echo Enterprise build selected, preparing)
@@ -90,6 +81,15 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
IGNORE:=$(shell ln -s $(BUILD_ENTERPRISE_DIR) enterprise) IGNORE:=$(shell ln -s $(BUILD_ENTERPRISE_DIR) enterprise)
endif endif
EE_PACKAGES=$(shell go list ./enterprise/...)
EE_PACKAGES_COMMA=$(shell echo $(EE_PACKAGES) | tr ' ' ',')
ifeq ($(BUILD_ENTERPRISE_READY),true)
ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA),$(EE_PACKAGES_COMMA)
else
ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA)
endif
all: run all: run