couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [1/5] couchdb commit: updated refs/heads/1843-feature-bigcouch to 9bc60be
Date Thu, 06 Feb 2014 23:33:10 GMT
Updated Branches:
  refs/heads/1843-feature-bigcouch 3688eab9d -> 9bc60be52


Enable coffescript on dev/run nodes


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

Branch: refs/heads/1843-feature-bigcouch
Commit: 84ed592442c00f0df0ec2173a437374fba035559
Parents: 3688eab
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Thu Feb 6 17:28:54 2014 -0600
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Thu Feb 6 17:28:54 2014 -0600

----------------------------------------------------------------------
 dev/run                     | 11 ++++++++++-
 rel/overlay/etc/default.ini |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/84ed5924/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 1e40eb1..e898acf 100755
--- a/dev/run
+++ b/dev/run
@@ -62,9 +62,14 @@ def hack_default_ini(opts, node, args, contents):
     # Replace couchjs command
     couchjs = os.path.join(COUCHDB, "src", "couch", "priv", "couchjs")
     mainjs = os.path.join(COUCHDB, "share", "server", "main.js")
+    coffeejs = os.path.join(COUCHDB, "share", "server", "main-coffee.js")
+
     repl = "javascript = %s %s" % (couchjs, mainjs)
     contents = re.sub("(?m)^javascript.*$", repl, contents)
 
+    repl = "coffeescript = %s %s" % (couchjs, coffeejs)
+    contents = re.sub("(?m)^coffeescript.*$", repl, contents)
+
     return contents
 
 
@@ -203,7 +208,11 @@ def reboot_nodes():
 
 def run_command(cmd):
     p = sp.Popen(cmd, shell=True, stdout=sp.PIPE, stderr=sys.stderr)
-    for line in p.stdout:
+    while True:
+        line = p.stdout.readline()
+        if not line:
+            break
+        sys.stderr.write("AND DOING" + os.linesep)
         try:
             eval(line)
         except:

http://git-wip-us.apache.org/repos/asf/couchdb/blob/84ed5924/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index be1745d..f40619f 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -41,7 +41,8 @@ timeout = 600 ; number of seconds before automatic logout
 auth_cache_size = 50 ; size is number of cache entries
 
 [query_servers]
-javascript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main.js
+javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
+coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
 
 [query_server_config]
 reduce_limit = true


Mime
View raw message