fauxton commit: updated refs/heads/master to 7787b35
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 2b7d8a464 -> 7787b3500
Updated Tags: refs/tags/v1.1.6 [created] 2cb892786
1.1.6
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7787b350
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7787b350
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7787b350
Branch: refs/heads/master
Commit: 7787b3500fc45f2ff09060ddbf548fdeed9dfae7
Parents: 2b7d8a4
Author: michellephung
Authored: Tue Jul 19 19:36:33 2016 -0400
Committer: michellephung
Committed: Tue Jul 19 19:36:33 2016 -0400
--
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7787b350/package.json
--
diff --git a/package.json b/package.json
index ea12e0c..d44bd12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fauxton",
- "version": "1.1.5",
+ "version": "1.1.6",
"description": "Fauxton is a modular CouchDB dashboard and Futon
replacement.",
"main": "./index.js",
"directories": {
fauxton commit: updated refs/heads/master to 2b7d8a4
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 6036fed42 -> 2b7d8a464
use code instead of message for linter
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2b7d8a46
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2b7d8a46
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2b7d8a46
Branch: refs/heads/master
Commit: 2b7d8a46498c71823ed943af30b28be7b253061b
Parents: 6036fed
Author: michellephung
Authored: Tue Jul 19 11:14:37 2016 -0400
Committer: michellephung
Committed: Tue Jul 19 11:16:23 2016 -0400
--
.eslintrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2b7d8a46/.eslintrc
--
diff --git a/.eslintrc b/.eslintrc
index 7cc98db..c009736 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -26,7 +26,7 @@
"no-trailing-spaces": 2,
"semi-spacing": [2, {"before": false, "after": true}],
"no-empty": 2,
-"space-in-parens": ["error", "never"]
+"space-in-parens": [2, "never"]
},
"parserOptions": {
[2/2] couchdb commit: updated refs/heads/master to b68e094
Quote application paths on Windows
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/79d9aaf7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/79d9aaf7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/79d9aaf7
Branch: refs/heads/master
Commit: 79d9aaf7d00a2b9cb5331a4607a0bfb90ed27520
Parents: e07dfde
Author: Joan Touzet
Authored: Tue Jul 19 11:28:53 2016 -0400
Committer: Joan Touzet
Committed: Tue Jul 19 11:30:25 2016 -0400
--
rel/overlay/bin/couchdb.cmd | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/79d9aaf7/rel/overlay/bin/couchdb.cmd
--
diff --git a/rel/overlay/bin/couchdb.cmd b/rel/overlay/bin/couchdb.cmd
index 831511f..a26e152 100644
--- a/rel/overlay/bin/couchdb.cmd
+++ b/rel/overlay/bin/couchdb.cmd
@@ -14,7 +14,7 @@
SET COUCHDB_BIN_DIR=%~dp0
SET ROOTDIR=%COUCHDB_BIN_DIR%\..\
-CD %ROOTDIR%
+CD "%ROOTDIR%"
SET /P START_ERL= < releases\start_erl.data
FOR /F "tokens=1" %%G IN ("%START_ERL%") DO SET ERTS_VSN=%%G
@@ -23,9 +23,10 @@ FOR /F "tokens=2" %%G IN ("%START_ERL%") DO SET APP_VSN=%%G
set BINDIR=%ROOTDIR%/erts-%ERTS_VSN%/bin
set EMU=beam
set PROGNAME=%~n0
+set PATH=%PATH%;%COUCHDB_BIN_DIR%
-%BINDIR%\erl -boot %ROOTDIR%\releases\%APP_VSN%\couchdb ^
--args_file %ROOTDIR%\etc\vm.args ^
--config %ROOTDIR%\releases\%APP_VSN%\sys.config
+"%BINDIR%\erl" -boot "%ROOTDIR%\releases\%APP_VSN%\couchdb" ^
+-args_file "%ROOTDIR%\etc\vm.args" ^
+-config "%ROOTDIR%\releases\%APP_VSN%\sys.config"
:: EXIT /B
[1/2] couchdb commit: updated refs/heads/master to b68e094
Repository: couchdb Updated Branches: refs/heads/master e07dfde40 -> b68e09439 Revise Windows installation readme Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b68e0943 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b68e0943 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b68e0943 Branch: refs/heads/master Commit: b68e094392d11c319d40c7119f11f4f3f463bb42 Parents: 79d9aaf Author: Joan Touzet Authored: Tue Jul 19 11:30:16 2016 -0400 Committer: Joan Touzet Committed: Tue Jul 19 11:30:25 2016 -0400 -- INSTALL.Windows.md | 207 +++- 1 file changed, 12 insertions(+), 195 deletions(-) -- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b68e0943/INSTALL.Windows.md -- diff --git a/INSTALL.Windows.md b/INSTALL.Windows.md index 7622eac..9ba84b7 100644 --- a/INSTALL.Windows.md +++ b/INSTALL.Windows.md @@ -1,204 +1,21 @@ Apache CouchDB INSTALL.Windows == -For a high-level guide to Microsoft Windows. +Due to the complexity of building CouchDB on the Windows platform, +full build documentation and all necessary support files are in +the couchdb-glazier repository. -Troubleshooting +Be sure to find the branch that matches the release you are building, for +example `couchdb_2.0`. -There is a troubleshooting guide: - -http://wiki.apache.org/couchdb/Troubleshooting - -There is a wiki for general documentation: - -http://wiki.apache.org/couchdb/ - -And some Windows-specific tips: - -http://wiki.apache.org/couchdb/Quirks_on_Windows - -There are collection of friendly mailing lists: - -http://couchdb.apache.org/community/lists.html - -Please work through these in order if you experience any problems. - -Dependencies +Build & Test +Once all dependencies are built and installed per the documentation in +couchdb-glazier, these commands will configure and build CouchDB: -You will need the following installed: - - * Erlang OTP (>=R16B03-1, =<18.1) (http://erlang.org/) - * ICU(>=4.*)(http://icu-project.org/) - * OpenSSL(>=0.9.8r) (http://www.openssl.org/) - * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/) - * libcurl(>=7.20) (http://curl.haxx.se/libcurl/) - * Cygwin(http://www.cygwin.com/) - * Microsoft SDK 7.0 or 7.1 (http://www.microsoft.com/en-us/download/details.aspx?id=8279) - * Python (>= 2.68) for docs (http://python.org/) - * Python Sphinx (>=1.1.3) (http://pypi.python.org/pypi/Sphinx) - -General Notes -- - - * When installing Cygwin, be sure to select all the `development` tools. - - * When installing Erlang, you must build it from source. - - * The CouchDB build requires a number of the Erlang build scripts. - - * All dependent libraries should be built with the same version of - microsoft SDK. - - * Do not try to link against libraries built with, or included in, - Cygwin or MingW. They are not compatible with the Erlang/OTP or CouchDB - build scripts. - - * ICU version 4.6 and later will build cleanly using MSBuild. - - * Python and Sphinx are optional for building the online documentation. - Use cygwin-provided Python and install Sphinx via easy_install or pip. - Further information is here http://pypi.python.org/pypi/setuptools#id4 - -Setting Up Cygwin -- - -Before starting any Cygwin terminals, run: - -set CYGWIN=nontsec - -To set up your environment, run: - -[VS_BIN]/vcvars32.bat - -Replace [VS_BIN] with the path to your Visual Studio `bin` directory. - -You must check that: - -* The `which link` command points to the Microsoft linker. - -* The `which cl` command points to the Microsoft compiler. - -* The `which mc` command points to the Microsoft message compiler. - -* The `which mt` command points to the Microsoft manifest tool. - -* The `which nmake` command points to the Microsoft make tool. - -If you do not do this, the build may fail due to Cygwin ones found in `/usr/bin` -being used instead. - -Building Erlang - -You must include Win32 OpenSSL, built statically from source. Use -exactly the same version as required by the Erlang/OTP build process. - -However, you can skip the GUI tools by running: - - echo "skipping gs" > lib/gs/SKIP - - echo "skipping ic" > lib/ic/SKIP - - echo "skipping jinterface" > lib/jinterface/SKIP - -Follow the rest of the Erlang instructions as described. - -After running: - - ./otp_build release -a - -You should run: - - ./release/win32/Install.exe -s - -This will set up the release/win32/bin directory correctly. The CouchDB -installation script
couchdb commit: updated refs/heads/master to e07dfde
Repository: couchdb
Updated Branches:
refs/heads/master dd8943edf -> e07dfde40
Use couch_epi:decide for validate_dbname
COUCHDB-3066
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e07dfde4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e07dfde4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e07dfde4
Branch: refs/heads/master
Commit: e07dfde401382628989995381840c451855e9eb0
Parents: dd8943e
Author: Robert Newson
Authored: Tue Jul 19 16:23:43 2016 +0100
Committer: Robert Newson
Committed: Tue Jul 19 16:23:43 2016 +0100
--
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e07dfde4/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index a2f365e..1cdc9fd 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
{couch_log,"couch-log",
"cc5540419e0a4bb7872d18bc5a94f39446d83a88"},
{couch_log_lager, "couch-log-lager",
"a7a8b7efb8855a8b0cf9612eeca7c190c414bbfb"},
{chttpd, "chttpd",
"5e3bf1f5e2e96841ce0d2b26606c7f590c067bdc"},
-{couch,"couch",
"4476595e028cde574c447024ed68c132203661e9"},
+{couch,"couch",
"ac3dae37da1e44dfba6fbed8ec11fa1c6779ee33"},
{couch_index, "couch-index",
"e7d269800302224eacf9585f74eb30822495755b"},
{couch_mrview, "couch-mrview",
"3ce28641c85af0d5054df47e9ac7de917a9d33cd"},
{couch_replicator, "couch-replicator",
"bf636d3088e39e392517117e4e5ed4e22f8f7e34"},
