Updates for elixir, mango tests, 2.3.0
diff --git a/.gitignore b/.gitignore
index 9ceef4e..119df6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.swp
release/*
bits/*.gz
bits/*.exe
diff --git a/README.md b/README.md
index c87c1c9..6d044d1 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,9 @@
```dos
cinst -y git 7zip.commandline StrawberryPerl nasm cyg-get wixtoolset python aria2 nodejs.install make
cinst -y nssm --version 2.24.101-g897c7ad
+cinst -y -i elixir
cyg-get p7zip autoconf binutils bison gcc-code gcc-g++ gdb git libtool make patchutils pkg-config readline file renameutils socat time tree util-linux wget
-pip install sphinx docutils pygments
+pip install sphinx docutils pygments nose hypothesis
```
*Note: Do NOT install curl or help2man inside CygWin!*
@@ -279,7 +280,7 @@
# git checkout --track origin/2.0.x
git clean -fdx && git reset --hard
powershell -ExecutionPolicy Bypass .\configure.ps1 -WithCurl
-make -f Makefile.win check
+make check
```
This will build a development version of CouchDB runnable via
@@ -292,13 +293,13 @@
_release_), after running the above use:
```dos
- make -f Makefile.win release
+ make release
```
To build an installer using WiX to create a full Windows .msi, run:
```dos
- make -f Makefile.win release
+ make release
cd \relax\glazier
bin\build_installer.cmd
```
diff --git a/installer/couchdb.wxs.in b/installer/couchdb.wxs.in
index b230d25..2358dba 100644
--- a/installer/couchdb.wxs.in
+++ b/installer/couchdb.wxs.in
@@ -16,7 +16,7 @@
<Product Id="4CD776E0-FADF-4831-AF56-E80E39F34CFC"
Name="Apache CouchDB"
Language="1033"
- Version="2.1.2"
+ Version="2.3.0"
Manufacturer="The Apache Software Foundation"
UpgradeCode="9449123B-61C4-40DE-AA6C-1BB9AA02EB67">
