Просмотр исходного кода

chore(build): inject product description from makefile

Zaiming Shi 4 лет назад
Родитель
Сommit
73500a0983
4 измененных файлов с 13 добавлено и 19 удалено
  1. 5 4
      Makefile
  2. 0 13
      build
  3. 1 2
      src/emqx.app.src
  4. 7 0
      src/emqx.app.src.script

+ 5 - 4
Makefile

@@ -4,6 +4,7 @@ REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
 SCRIPTS = $(CURDIR)/scripts
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
+export EMQX_DESC ?= EMQ X
 export EMQX_CE_DASHBOARD_VERSION ?= v4.3.0-beta.1
 export EMQX_CE_DASHBOARD_VERSION ?= v4.3.0-beta.1
 
 
 PROFILE ?= emqx
 PROFILE ?= emqx
@@ -53,9 +54,9 @@ coveralls: $(REBAR)
 .PHONY: $(REL_PROFILES)
 .PHONY: $(REL_PROFILES)
 $(REL_PROFILES:%=%): $(REBAR) get-dashboard
 $(REL_PROFILES:%=%): $(REBAR) get-dashboard
 ifneq ($(shell echo $(@) |grep edge),)
 ifneq ($(shell echo $(@) |grep edge),)
-	@export EMQX_DESC="EMQ X Edge"
+	@export EMQX_DESC="$${EMQX_DESC} Edge"
 else
 else
-	@export EMQX_DESC="EMQ X Broker"
+	@export EMQX_DESC="$${EMQX_DESC} Broker"
 endif
 endif
 	@$(REBAR) as $(@) release
 	@$(REBAR) as $(@) release
 
 
@@ -72,9 +73,9 @@ deps-all: $(REBAR) $(PROFILES:%=deps-%)
 .PHONY: $(PROFILES:%=deps-%)
 .PHONY: $(PROFILES:%=deps-%)
 $(PROFILES:%=deps-%): $(REBAR) get-dashboard
 $(PROFILES:%=deps-%): $(REBAR) get-dashboard
 ifneq ($(shell echo $(@) |grep edge),)
 ifneq ($(shell echo $(@) |grep edge),)
-	@export EMQX_DESC="EMQ X Edge"
+	@export EMQX_DESC="$${EMQX_DESC} Edge"
 else
 else
-	@export EMQX_DESC="EMQ X Broker"
+	@export EMQX_DESC="$${EMQX_DESC} Broker"
 endif
 endif
 	@$(REBAR) as $(@:deps-%=%) get-deps
 	@$(REBAR) as $(@:deps-%=%) get-deps
 
 

+ 0 - 13
build

@@ -12,19 +12,6 @@ ARTIFACT="$2"
 # ensure dir
 # ensure dir
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
 
 
-case "$PROFILE" in
-    emqx-edge*)
-	    export EMQX_DESC="EMQ X Edge"
-        ;;
-    emqx*)
-	    export EMQX_DESC="EMQ X Broker"
-        ;;
-    *)
-        echo "Unknown profile $PROFILE"
-        exit 1
-        ;;
-esac
-
 PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
 PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
 export PKG_VSN
 export PKG_VSN
 
 

+ 1 - 2
src/emqx.app.src

@@ -1,6 +1,5 @@
 {application, emqx,
 {application, emqx,
- [{description, "EMQ X Broker"},
-  {id, "emqx"},
+ [{id, "emqx"},
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {modules, []},
   {registered, []},
   {registered, []},

+ 7 - 0
src/emqx.app.src.script

@@ -0,0 +1,7 @@
+[{application, Name, Opts}] = CONFIG,
+case os:getenv("EMQX_DESC") of
+    [_ | _] = Desc ->
+      [{application, Name, [{description, Desc} | Opts]}];
+    _ ->
+      error(env_var_EMQX_DESC_not_set)
+end.