From c5c55999841481f027c31eabb325671e135e148f Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Tue, 7 Jan 2014 03:38:02 +0100
Subject: [PATCH] fix libCurl download

- Use same URL/zip as windows installer.
- get_dlibcurl32 fails, because the downloaded libcurl.dll
  depends on additional dlls.
- Use std.net.curl to download the zip, i.e. create_dmd_release
  depends on a working libcurl.dll, but uses the downloaded one
  to build a release.
---
 create_dmd_release/create_dmd_release.d | 30 ++++++++++++-------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/create_dmd_release/create_dmd_release.d b/create_dmd_release/create_dmd_release.d
index 4a7bd6f5..e7356c36 100644
--- a/create_dmd_release/create_dmd_release.d
+++ b/create_dmd_release/create_dmd_release.d
@@ -132,7 +132,8 @@ version(Windows)
     immutable make          = "make";
     immutable useBitsSuffix = false; // Ie: "bin"/"lib" or "bin32"/"lib32"
 
-    immutable libCurlVersion = "7.32.0"; // Windows-only
+    immutable libCurlVersion = "7.34.0";
+    immutable libCurlZipURL = "http://downloads.dlang.org/other/libcurl-"~libCurlVersion~"-WinSSL-zlib-x86-x64.zip";
 }
 else version(Posix)
 {
@@ -790,19 +791,6 @@ void buildAll(Bits bits, bool dmdOnly=false)
     // Build docs
     if(!alreadyBuiltDocs)
     {
-        version(Windows)
-        {
-            // The chm/libcurl stuff is Win32-only
-            if(bits == Bits.bits32)
-            {
-                // Needed by chmgen to build a chm of the docs on Windows
-                infoMsg("Getting curl Import Lib");
-                changeDir(cloneDir~"/tools");
-                run(cloneDir~"/dmd/src/dmd -gc get_dlibcurl32.d");
-                run("get_dlibcurl32 "~libCurlVersion~hideStdout);
-            }
-        }
-
         infoMsg("Building Druntime Docs");
         changeDir(cloneDir~"/druntime");
         run(make~jobs~makeModel~dmdEnv~" doc DOCSRC=../dlang.org DOCDIR=../web/phobos-prerelease -f "~targetMakefile~hideStdout);
@@ -836,8 +824,18 @@ void buildAll(Bits bits, bool dmdOnly=false)
             // The chm/libcurl stuff is Win32-only
             if(bits == Bits.bits32)
             {
-                copyFile(cloneDir~"/tools/dlibcurl32-"~libCurlVersion~"/libcurl.lib", "./curl.lib");
-                copyDir(cloneDir~"/tools/dlibcurl32-"~libCurlVersion, ".", file => file.endsWith(".dll"));
+                import std.net.curl;
+                ZipArchive zip;
+                try
+                    zip = new ZipArchive(get!(HTTP, ubyte)(libCurlZipURL));
+                catch (CurlException e)
+                    errorMsg("Failed to download "~libCurlZipURL~".\r\n"~e.toString());
+                foreach (file; ["dmd2/windows/lib/curl.lib", "dmd2/windows/bin/libcurl.dll"])
+                {
+                    auto am = zip.directory[file];
+                    zip.expand(am);
+                    std.file.write(baseName(file), am.expandedData);
+                }
                 run(make~jobs~dmdEnv~" chm DOCSRC=../dlang.org DOCDIR=../web/phobos-prerelease -f "~makefile~hideStdout);
             }
         }