Browse Source

Use git tag for app vsn

spring2maz 7 years ago
parent
commit
14dfe03426
3 changed files with 2 additions and 3 deletions
  1. 0 1
      Makefile
  2. 1 1
      erlang.mk
  3. 1 1
      src/emqx.app.src

+ 0 - 1
Makefile

@@ -2,7 +2,6 @@
 
 
 PROJECT = emqx
 PROJECT = emqx
 PROJECT_DESCRIPTION = EMQ X Broker
 PROJECT_DESCRIPTION = EMQ X Broker
-PROJECT_VERSION = 3.0.0
 
 
 DEPS = jsx gproc gen_rpc ekka esockd cowboy clique
 DEPS = jsx gproc gen_rpc ekka esockd cowboy clique
 
 

+ 1 - 1
erlang.mk

@@ -1186,7 +1186,7 @@ else
 	fi
 	fi
 	$(appsrc_verbose) cat src/$(PROJECT).app.src \
 	$(appsrc_verbose) cat src/$(PROJECT).app.src \
 		| sed "s/{[[:space:]]*modules[[:space:]]*,[[:space:]]*\[\]}/{modules, \[$(call comma_list,$(MODULES))\]}/" \
 		| sed "s/{[[:space:]]*modules[[:space:]]*,[[:space:]]*\[\]}/{modules, \[$(call comma_list,$(MODULES))\]}/" \
-		| sed "s/{id,[[:space:]]*\"git\"}/{id, \"$(subst /,\/,$(GITDESCRIBE))\"}/" \
+		| sed "s/{vsn,[[:space:]]*\"git\"}/{vsn, \"$(subst /,\/,$(GITDESCRIBE))\"}/" \
 		> ebin/$(PROJECT).app
 		> ebin/$(PROJECT).app
 endif
 endif
 
 

+ 1 - 1
src/emqx.app.src

@@ -1,6 +1,6 @@
 {application,emqx,
 {application,emqx,
              [{description,"EMQ X Broker"},
              [{description,"EMQ X Broker"},
-              {vsn,"3.0.0"},
+              {vsn,"git"},
               {modules,[]},
               {modules,[]},
               {registered,[emqx_sup]},
               {registered,[emqx_sup]},
               {applications,[kernel,stdlib,jsx,gproc,gen_rpc,esockd,
               {applications,[kernel,stdlib,jsx,gproc,gen_rpc,esockd,