couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woh...@apache.org
Subject [1/4] couchdb commit: updated refs/heads/master to 3f1b0c4
Date Mon, 20 Jun 2016 20:14:06 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 5e8041e96 -> 3f1b0c4e2


Use UNIX-style paths for view servers on Windows


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

Branch: refs/heads/master
Commit: 03bbe213ef49cb8f2bfac190257f0cbe9b1d5f54
Parents: 5e8041e
Author: Joan Touzet <wohali@atypical.net>
Authored: Fri Jun 17 19:12:41 2016 -0400
Committer: Joan Touzet <wohali@atypical.net>
Committed: Fri Jun 17 19:12:41 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/03bbe213/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 8f2164e..81398d0 100755
--- a/dev/run
+++ b/dev/run
@@ -249,9 +249,15 @@ def hack_default_ini(ctx, node, content):
     coffeejs = os.path.join(ctx['rootdir'], "share", "server", "main-coffee.js")
 
     repl = "javascript = %s %s" % (couchjs, mainjs)
+    if os.name == 'nt':
+        # Erlang always wants UNIX-style paths
+        repl = repl.replace("\\", "/")
     contents = re.sub("(?m)^javascript.*$", repl, contents)
 
     repl = "coffeescript = %s %s" % (couchjs, coffeejs)
+    if os.name == 'nt':
+        # Erlang always wants UNIX-style paths
+        repl = repl.replace("\\", "/")
     contents = re.sub("(?m)^coffeescript.*$", repl, contents)
 
     return contents


Mime
View raw message