support CouchDB 1.1.1 and new git repo
- update README to refer to git repo instead of svn
- explain which config script should be used for each CouchDB release
- document workarounds for cygwin / autotools / configure.ac issues
diff --git a/README.md b/README.md
index 30e57ab..d61e181 100644
--- a/README.md
+++ b/README.md
@@ -269,8 +269,8 @@
There are three relevant scripts for building CouchDB:
-* `couchdb_config_js180.sh` for CouchDB 1.1.0 + js18x with libcurl
-* `couchdb_config_js185.sh` for CouchDB 1.2.0 + js185 without libcurl
+* `couchdb_config_js180.sh` for CouchDB 1.1.0 or older, using js180
+* `couchdb_config_js185.sh` for CouchDB 1.1.1 or newer, supporting js185
* `couchdb_build.sh` which compiles, and packages, CouchDB
There are still some patches required against both released and trunk versions.
@@ -282,12 +282,17 @@
/relax/bin/couchdb_config_js180.sh
/relax/bin/couchdb_build.sh
-For CouchDB 1.2.x, patches are in trunk from a small, filthy hack, which
-is needed until `configure.ac` avoids detection of cygwin's curl.
+For CouchDB 1.1.1 or newer, two small filthy hacks are required, which
+is needed until `configure.ac` avoids detection of cygwin's curl and avoids
+assuming that help2man will be useful on Windows.
- cd /relax && svn checkout https://svn.apache.org/repos/asf/couchdb/trunk
- cd trunk
+ cd /relax
+ git clone http://git-wip-us.apache.org/repos/asf/couchdb.git
+ git checkout 1.1.1
+ git clean -fdx
+ cd couchdb
mv /usr/bin/curl-config /usr/bin/curl-config.dist
+ mv /usr/bin/help2man /usr/bin/help2man.dist
./bootstrap
/relax/bin/couchdb_config_js185.sh
/relax/bin/couchdb_build.sh
diff --git a/bin/couchdb_config_js185.sh b/bin/couchdb_config_js185.sh
index c42176a..6c6c15e 100755
--- a/bin/couchdb_config_js185.sh
+++ b/bin/couchdb_config_js185.sh
@@ -2,18 +2,16 @@
COUCH_TOP=`pwd`
export COUCH_TOP
-## --with-win32-curl=/relax/curl \
-
./configure \
--prefix=$ERL_TOP/release/win32 \
--with-erlang=$ERL_TOP/release/win32/usr/include \
--with-win32-icu-binaries=/relax/icu \
+--with-win32-curl=/relax/curl \
--with-openssl-bin-dir=/relax/openssl/bin \
--with-msvc-redist-dir=/relax \
--with-js-lib=/relax/js-1.8.5/js/src/dist/lib \
--with-js-include=/relax/js-1.8.5/js/src/dist/include \
2>&1 | tee $COUCH_TOP/build_configure.txt
### --enable-static \
-### --with-win32-curl=/relax/curl \
echo DONE. | tee -a $COUCH_TOP/build_configure.txt
