You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/13 04:25:53 UTC
[2/5] couch commit: updated refs/heads/1994-merge-rcouch to 3f51842
release: version couch.app.src shoud be set manually
fix build issue with some old version of rebar. Now the version of the
couch.app is set manually.
RCOUCH-2 done
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/ed2f926f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/ed2f926f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/ed2f926f
Branch: refs/heads/1994-merge-rcouch
Commit: ed2f926fc54d02210e4887ccd2f9a36668b8b771
Parents: e5856d4
Author: benoitc <be...@apache.org>
Authored: Sun Feb 9 15:57:44 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Feb 12 21:23:54 2014 -0600
----------------------------------------------------------------------
src/couch.app.src | 41 ++++++++++++++++++++++++++
src/couch.app.src.script | 67 -------------------------------------------
src/couch.erl | 9 ------
src/couch_server.erl | 2 +-
4 files changed, 42 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/ed2f926f/src/couch.app.src
----------------------------------------------------------------------
diff --git a/src/couch.app.src b/src/couch.app.src
index e69de29..b3ed46c 100644
--- a/src/couch.app.src
+++ b/src/couch.app.src
@@ -0,0 +1,41 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ft=erlang ts=4 sw=4 et
+
+%% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+%% use this file except in compliance with the License. You may obtain a copy of
+%% the License at
+%%
+%% http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+%% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+%% License for the specific language governing permissions and limitations under
+%% the License.
+
+
+{application, couch, [
+ {description, "Apache CouchDB"},
+ {vsn, "1.6.1"},
+ {registered, [
+ couch_config,
+ couch_db_update,
+ couch_db_update_notifier_sup,
+ couch_external_manager,
+ couch_index_sup,
+ couch_log,
+ couch_primary_services,
+ couch_query_servers,
+ couch_secondary_services,
+ couch_server,
+ couch_sup,
+ couch_stats_aggregator,
+ couch_stats_collector,
+ couch_task_status
+ ]},
+ {mod, {couch_app, []}},
+ {env, []},
+ {applications, [kernel, stdlib, crypto, sasl, asn1, public_key,
+ ssl, os_mon, inets]}
+]}.
+
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/ed2f926f/src/couch.app.src.script
----------------------------------------------------------------------
diff --git a/src/couch.app.src.script b/src/couch.app.src.script
deleted file mode 100644
index ac8156d..0000000
--- a/src/couch.app.src.script
+++ /dev/null
@@ -1,67 +0,0 @@
-%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ft=erlang ts=4 sw=4 et
-
-%% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-%% use this file except in compliance with the License. You may obtain a copy of
-%% the License at
-%%
-%% http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-%% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-%% License for the specific language governing permissions and limitations under
-%% the License.
-
-
-Cfg = case file:consult("../../pkg.vars.config") of
- {ok, Terms} ->
- Terms;
- _Err ->
- []
- end,
-
-%% get version infos
-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,
-RelVsn = case os:getenv("RELEASE") of
- "1" ->
- BaseVersion;
- _ ->
- BaseVersion ++ SecondaryVersion
-end,
-
-
-[
- {application, couch, [
- {description, "Apache CouchDB"},
- {vsn, "1.6.1"},
- {registered, [
- couch_config,
- couch_db_update,
- couch_db_update_notifier_sup,
- couch_external_manager,
- couch_index_sup,
- couch_log,
- couch_primary_services,
- couch_query_servers,
- couch_secondary_services,
- couch_server,
- couch_sup,
- couch_stats_aggregator,
- couch_stats_collector,
- couch_task_status
- ]},
- {mod, {couch_app, []}},
- {env, [{couch_rel, RelVsn}]},
- {applications, [kernel, stdlib, crypto, sasl, asn1, public_key,
- ssl, os_mon, inets]}
- ]}
-].
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/ed2f926f/src/couch.erl
----------------------------------------------------------------------
diff --git a/src/couch.erl b/src/couch.erl
index fe4f1a8..59fe7bc 100644
--- a/src/couch.erl
+++ b/src/couch.erl
@@ -14,7 +14,6 @@
-export([get_app_env/2,
version/0,
- release_version/0,
start/0,
stop/0,
restart/0,
@@ -34,14 +33,6 @@ version() ->
"0.0.0"
end.
-release_version() ->
- case application:get_env(couch, couch_rel) of
- {ok, Vsn} ->
- Vsn;
- _ ->
- "0.0.0"
- end.
-
start() ->
couch_util:start_app_deps(couch),
application:start(couch).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/ed2f926f/src/couch_server.erl
----------------------------------------------------------------------
diff --git a/src/couch_server.erl b/src/couch_server.erl
index 91b4bc7..d80aa1d 100644
--- a/src/couch_server.erl
+++ b/src/couch_server.erl
@@ -35,7 +35,7 @@ dev_start() ->
couch:start().
get_version() ->
- couch:release_version().
+ couch:version().
get_version(short) ->
%% strip git hash from version string
[Version|_Rest] = string:tokens(get_version(), "+"),