Skip to content
Permalink
Browse files
bump libcURL to 7.23.1 and support SDK 7.1
  • Loading branch information
dch committed Dec 30, 2011
1 parent 5ccea19 commit fdc8f6fbaed4bce1f8d375ef6a38339786f1ee2a
Showing 4 changed files with 9 additions and 12 deletions.
@@ -198,7 +198,7 @@ via `setenv /release /x86` again

# LibcURL
################################################################################
LibcURL is only required for versions of CouchDB <= 1.10 where it is embedded
LibcURL is only required for versions of CouchDB < 1.1.1 where it is embedded
in couchjs.exe. Trunk and future releases will have this as an optional include.

* download [LibcURL] source from (http://curl.haxx.se/)
@@ -207,7 +207,7 @@ via `setenv /release /x86` again

%relax%\bin\build_curl.cmd

[libcurl]: http://curl.haxx.se/download/curl-7.21.7.zip
[libcurl]: http://curl.haxx.se/download/curl-7.23.1.zip

# Javascript
################################################################################
@@ -1,5 +1,5 @@
::setlocal
path=%path%;%relax%\cmake\bin;%relax%\7zip;%relax%\openssl\bin;
path=%path%;%relax%\cmake\bin;c:\mozilla-build\7zip;%relax%\openssl\bin;

for %%i in ("%RELAX%\bits\curl-*.zip") do set curl_ver=%%~ni
setx CURL_VER %curl_ver%
@@ -22,18 +22,15 @@ if defined curl_ver rd /s/q %curl_src%

::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
pushd %curl_src%
:: settings for Compiler
:: ensure curl can find OpenSSL libraries
set USE_SSLEAY=1
set USE_OPENSSL=1
set OPENSSL_PATH=%SSL_PATH%
set INCLUDE=%INCLUDE%;%SSL_PATH%\include;%SSL_PATH%\include\openssl;
set LIBPATH=%LIBPATH%;%SSL_PATH%\lib;
set LIB=%LIB%;%SSL_PATH%\lib;
vcbuild /useenv /upgrade /platform:Win32 lib\libcurl.vcproj
vcbuild /useenv /platform:Win32 lib\libcurl.vcproj "Release|Win32"
xcopy lib\Release\libcurl.lib lib\ /y
:: nmake doesn't pull in SSL .libs correctly
:: pushd %relax%\curl-*\lib
:: nmake /f Makefile.vc9 CFG=release-ssl
pushd %curl_src%
nmake VC=vc10 vc-ssl
popd
:: make this specific curl version available to CouchDB build script
mklink /d %curl_path% %curl_src%
@@ -1,7 +1,7 @@
907b763d3a14b6649bf0371ffa75a36b *apache-couchdb-1.1.0.tar.gz
8e0411224c978aaa449210637165072c *curl-7.21.7.zip
018e04dfd1539529b05b43d5a932f7a4 *isetup-5.4.2-unicode.exe
aafbb7a9773aae4ae06a7304197843ff *cmake-2.8.6-win32-x86.zip
be464adce11266492a2ccc8fc6b53c90 *curl-7.23.1.zip
eb0d2dcca17c0c05480cbb114dffb83f *icu4c-4_6_1-src.zip
a4574365938222adca0a6bd33329cb32 *js185-1.0.0.tar.gz
998d7ec6d9f07237fe0d54e5c7ffc4ae *MozillaBuildSetup-1.6.exe
@@ -28,8 +28,8 @@ http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFF

################################################################################
### OpenSSL and libcURL
http://curl.haxx.se/download/curl-7.21.7.zip
http://www.openssl.org/source/openssl-0.9.8r.tar.gz
http://curl.haxx.se/download/curl-7.23.1.zip
################################################################################
### bits required to build erlang
http://www.erlang.org/download/otp_src_R15B.tar.gz

0 comments on commit fdc8f6f

Please sign in to comment.