You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/15 22:03:21 UTC
couch commit: updated refs/heads/1994-merge-rcouch to 64d7f59
Repository: couchdb-couch
Updated Branches:
refs/heads/1994-merge-rcouch 5cbf25fe7 -> 64d7f590f
use the RELEASE_TAG enviroment variable in the couchjs version if set.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/64d7f590
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/64d7f590
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/64d7f590
Branch: refs/heads/1994-merge-rcouch
Commit: 64d7f590f84396ee8b15ec5e87977163d93c0468
Parents: 5cbf25f
Author: benoitc <bc...@gmail.com>
Authored: Sat Feb 15 22:02:18 2014 +0100
Committer: benoitc <bc...@gmail.com>
Committed: Sat Feb 15 22:02:18 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/64d7f590/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 3acdfae..0a79ced 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -25,17 +25,19 @@ Cfg = case file:consult("../../pkg.vars.config") of
MajorVersion = integer_to_list(proplists:get_value(version_major, Cfg, 0)),
MinorVersion = integer_to_list(proplists:get_value(version_minor, Cfg, 0)),
RevVersion = integer_to_list(proplists:get_value(version_revision, Cfg, 0)),
-StageVersion = proplists:get_value(version_stage, Cfg, ""),
-RelVersion = proplists:get_value(version_release, Cfg, ""),
%% build the version
BaseVersion = MajorVersion ++ "." ++ MinorVersion ++ "." ++ RevVersion,
-SecondaryVersion = StageVersion ++ RelVersion,
-Version = case os:getenv("RELEASE") of
- "1" ->
+
+Version = case os:getenv("RELEASE_TAG") of
+ false ->
BaseVersion;
- _ ->
- BaseVersion ++ SecondaryVersion
+ "git" ->
+ {0, Ret} = eunit_lib:command("git describe --always"),
+ Tag = [C||C <- Ret, C =/= $\n],
+ BaseVersion ++ "+build." ++ Tag;
+ Tag ->
+ BaseVersion ++ Tag
end,
%% couchjs name