Merge remote branch 'cloudant:define_couch_version'
This closes #199
Signed-off-by: ILYA Khlopotov <iilyak@ca.ibm.com>
diff --git a/rebar.config b/rebar.config
deleted file mode 100644
index 43e2924..0000000
--- a/rebar.config
+++ /dev/null
@@ -1,2 +0,0 @@
-{erl_opts, [{platform_define, "win32", 'WINDOWS'}]}.
-{eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}.
diff --git a/rebar.config.script b/rebar.config.script
index 8e4ea13..8d44099 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -132,7 +132,14 @@
BaseSpecs
end,
-AddConfig = [{port_specs, PortSpecs}].
+AddConfig = [
+ {port_specs, PortSpecs},
+ {erl_opts, [
+ {platform_define, "win32", 'WINDOWS'},
+ {d, 'COUCHDB_VERSION', Version}
+ ]},
+ {eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}
+].
lists:foldl(fun({K, V}, CfgAcc) ->
lists:keystore(K, 1, CfgAcc, {K, V})
diff --git a/src/couch.app.src.script b/src/couch.app.src
similarity index 82%
rename from src/couch.app.src.script
rename to src/couch.app.src
index 60a9345..cf3dc79 100644
--- a/src/couch.app.src.script
+++ b/src/couch.app.src
@@ -10,18 +10,9 @@
% License for the specific language governing permissions and limitations under
% the License.
-%% cut-paste from rebar.config.script. dedupe somehow later.
-Version = case os:getenv("COUCHDB_VERSION") of
- false ->
- string:strip(os:cmd("git describe --always"), right, $\n);
- Version0 ->
- string:strip(Version0, right)
-end,
-
-
{application, couch, [
{description, "Apache CouchDB"},
- {vsn, Version},
+ {vsn, git},
{registered, [
couch_db_update,
couch_db_update_notifier_sup,
diff --git a/src/couch_server.erl b/src/couch_server.erl
index d7adf33..364cbb9 100644
--- a/src/couch_server.erl
+++ b/src/couch_server.erl
@@ -45,10 +45,7 @@
couch:start().
get_version() ->
- case application:get_key(couch, vsn) of
- {ok, Version} -> Version;
- undefined -> "0.0.0"
- end.
+ ?COUCHDB_VERSION. %% Defined in rebar.config.script
get_version(short) ->
%% strip git hash from version string
[Version|_Rest] = string:tokens(get_version(), "+"),
