couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couchdb commit: updated refs/heads/master to 92c95de
Date Wed, 13 Jul 2016 14:52:37 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 6e7efa960 -> 92c95dece


find fauxton in dev or final place


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

Branch: refs/heads/master
Commit: 92c95dece6aebcc06f12bf2e944b26b77f1aa887
Parents: 6e7efa9
Author: Robert Newson <rnewson@apache.org>
Authored: Wed Jul 13 15:09:42 2016 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed Jul 13 15:09:42 2016 +0100

----------------------------------------------------------------------
 dev/run | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/92c95dec/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 233438d..fc1bab2 100755
--- a/dev/run
+++ b/dev/run
@@ -167,6 +167,11 @@ def check_beams(ctx):
 
 @log('Prepare configuration files')
 def setup_configs(ctx):
+    if os.path.exists("src/fauxton/dist/release"):
+        fauxton_root = "src/fauxton/dist/release"
+    else:
+        fauxton_root = "share/www"
+
     for idx, node in enumerate(ctx['nodes']):
         cluster_port, backend_port = get_ports(idx + ctx['node_number'])
         env = {
@@ -179,7 +184,7 @@ def setup_configs(ctx):
             "node_name": "-name %s@127.0.0.1" % node,
             "cluster_port": cluster_port,
             "backend_port": backend_port,
-            "fauxton_root": "src/fauxton/dist/release",
+            "fauxton_root": fauxton_root,
             "uuid": "fake_uuid_for_dev"
         }
         write_config(ctx, node, env)


Mime
View raw message