couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couch commit: updated refs/heads/master to 7d0cfb5
Date Mon, 12 Sep 2016 09:29:14 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master c613dabf6 -> 7d0cfb5f9


get version from environment in cross-platform way


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/7d0cfb5f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/7d0cfb5f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/7d0cfb5f

Branch: refs/heads/master
Commit: 7d0cfb5f9d1f0fcdc607b46f31ae33cbf65115df
Parents: c613dab
Author: Robert Newson <rnewson@apache.org>
Authored: Mon Sep 12 10:28:51 2016 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon Sep 12 10:28:51 2016 +0100

----------------------------------------------------------------------
 src/couch.app.src        | 52 ------------------------------------
 src/couch.app.src.script | 61 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/7d0cfb5f/src/couch.app.src
----------------------------------------------------------------------
diff --git a/src/couch.app.src b/src/couch.app.src
deleted file mode 100644
index d30f106..0000000
--- a/src/couch.app.src
+++ /dev/null
@@ -1,52 +0,0 @@
-% 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, {cmd, "echo $COUCHDB_VERSION"}},
-    {registered, [
-        couch_db_update,
-        couch_db_update_notifier_sup,
-        couch_external_manager,
-        couch_httpd,
-        couch_primary_services,
-        couch_proc_manager,
-        couch_secondary_services,
-        couch_server,
-        couch_sup,
-        couch_task_status
-    ]},
-    {mod, {couch_app, []}},
-    {applications, [
-        % stdlib
-        kernel,
-        stdlib,
-        crypto,
-        sasl,
-        inets,
-        ssl,
-        os_mon,
-
-        % Upstream deps
-        ibrowse,
-        mochiweb,
-        oauth,
-
-        % ASF deps
-        couch_epi,
-        b64url,
-        couch_log,
-        couch_event,
-        ioq,
-        couch_stats
-    ]}
-]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/7d0cfb5f/src/couch.app.src.script
----------------------------------------------------------------------
diff --git a/src/couch.app.src.script b/src/couch.app.src.script
new file mode 100644
index 0000000..40d922e
--- /dev/null
+++ b/src/couch.app.src.script
@@ -0,0 +1,61 @@
+% 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.
+
+%% 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 ->
+        Version0
+end,
+
+
+{application, couch, [
+    {description, "Apache CouchDB"},
+    {vsn, Version},
+    {registered, [
+        couch_db_update,
+        couch_db_update_notifier_sup,
+        couch_external_manager,
+        couch_httpd,
+        couch_primary_services,
+        couch_proc_manager,
+        couch_secondary_services,
+        couch_server,
+        couch_sup,
+        couch_task_status
+    ]},
+    {mod, {couch_app, []}},
+    {applications, [
+        % stdlib
+        kernel,
+        stdlib,
+        crypto,
+        sasl,
+        inets,
+        ssl,
+        os_mon,
+
+        % Upstream deps
+        ibrowse,
+        mochiweb,
+        oauth,
+
+        % ASF deps
+        couch_epi,
+        b64url,
+        couch_log,
+        couch_event,
+        ioq,
+        couch_stats
+    ]}
+]}.


Mime
View raw message