You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2011/06/23 01:18:19 UTC
svn commit: r1138679 - in /couchdb/branches/1.0.x: INSTALL.Windows
src/couchdb/priv/Makefile.am
Author: davisp
Date: Wed Jun 22 23:18:19 2011
New Revision: 1138679
URL: http://svn.apache.org/viewvc?rev=1138679&view=rev
Log:
Fixes COUCHDB-1152 - Update ICU on Windows.
Thanks to Dave Cottlehuber for the patch.
Modified:
couchdb/branches/1.0.x/INSTALL.Windows
couchdb/branches/1.0.x/src/couchdb/priv/Makefile.am
Modified: couchdb/branches/1.0.x/INSTALL.Windows
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/INSTALL.Windows?rev=1138679&r1=1138678&r2=1138679&view=diff
==============================================================================
--- couchdb/branches/1.0.x/INSTALL.Windows (original)
+++ couchdb/branches/1.0.x/INSTALL.Windows Wed Jun 22 23:18:19 2011
@@ -8,8 +8,8 @@ Dependencies
You will need the following installed:
- * Erlang OTP (=14B01) (http://erlang.org/)
- * ICU (http://icu.sourceforge.net/)
+ * Erlang OTP (>=14B03) (http://erlang.org/)
+ * ICU (=4.4.*) (http://icu.sourceforge.net/)
* OpenSSL (http://www.openssl.org/)
* Mozilla SpiderMonkey (1.8) (http://www.mozilla.org/js/spidermonkey/)
* libcurl (http://curl.haxx.se/libcurl/)
@@ -21,7 +21,7 @@ General Notes
* When installing Erlang, you must build it from source.
- The CouchDB build makes use of a number of the Erlang build scripts.
+The CouchDB build requires a number of the Erlang build scripts.
* When installing ICU, select the binaries built with Visual Studio 2008.
Modified: couchdb/branches/1.0.x/src/couchdb/priv/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/priv/Makefile.am?rev=1138679&r1=1138678&r2=1138679&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/priv/Makefile.am (original)
+++ couchdb/branches/1.0.x/src/couchdb/priv/Makefile.am Wed Jun 22 23:18:19 2011
@@ -79,9 +79,9 @@ install-data-hook:
$(LN_S) couch_icu_driver couch_icu_driver.so; \
fi
if WINDOWS
- $(INSTALL) $(ICU_LOCAL_BIN)/icuuc42.dll $(bindir)
- $(INSTALL) $(ICU_LOCAL_BIN)/icudt42.dll $(bindir)
- $(INSTALL) $(ICU_LOCAL_BIN)/icuin42.dll $(bindir)
+ $(INSTALL) $(ICU_LOCAL_BIN)/icuuc44.dll $(bindir)
+ $(INSTALL) $(ICU_LOCAL_BIN)/icudt44.dll $(bindir)
+ $(INSTALL) $(ICU_LOCAL_BIN)/icuin44.dll $(bindir)
$(INSTALL) $(JS_LIB_BINARY) $(bindir)
$(INSTALL) .libs/couchspawnkillable.exe \
"$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"