auto merge of #591 : alexcrichton/cargo/snapshots, r=alexcrichton

.travis.install.deps.sh

@@ -49,33 +49,15 @@ if [ -z "${windows}" ]; then
     rm -f rust-nightly-i686-$target.tar.gz
     rm -f rust-nightly-x86_64-$target.tar.gz
 else
-    rm -rf *.exe rustc
-    # Right now we don't have *cargo* nightlies for 64-bit windows. This means
-    # that to bootstrap the 64-bit cargo nightlies, we need to build from the
-    # 32-bit cargo. This, however, has a runtime dependency on libgcc_s_dw2
-    # which is not present in the mingw-w64 64-bit shell. Hence we download both
-    # *rust* snapshots, and then when we're on a 64-bit windows host we copy the
-    # libgcc_s_dw2 dll from the 32-bit rust nightly into a location that will be
-    # in our PATH
-    #
-    # When cargo has a 64-bit nightly of its own, we'll only need to download
-    # the relevant windows nightly.
-    v32=i686-w64-mingw32
-    v64=x86_64-w64-mingw32
-    curl -O http://$host/dist/rust-nightly-$v32.exe
-    curl -O http://$host/dist/rust-nightly-$v64.exe
     if [ "${BITS}" = "64" ]; then
-        innounp -y -x rust-nightly-$v64.exe
-        mv '{app}' rustc
-        innounp -y -x rust-nightly-$v32.exe
-        mv '{app}/bin/libgcc_s_dw2-1.dll' rustc/bin
-        rm -rf '{app}'
+        triple=x86_64-w64-mingw32
     else
-        innounp -y -x rust-nightly-$v32.exe
-        mv '{app}' rustc
+        triple=i686-w64-mingw32
     fi
-    rm -f rust-nightly-$v32.exe
-    rm -f rust-nightly-$v64.exe
+    curl -O http://$host/dist/rust-nightly-$triple.exe
+    innounp -y -x rust-nightly-$triple.exe
+    mv '{app}' rustc
+    rm -f rust-nightly-$triple.exe
 fi
 
 set +x

src/etc/dl-snapshot.py

@@ -15,6 +15,7 @@
 mac32 = lines[3]
 mac64 = lines[4]
 win32 = lines[5]
+win64 = lines[6]
 triple = sys.argv[1]
 
 if triple == 'i686-unknown-linux-gnu':
@@ -26,11 +27,9 @@
 elif triple == 'x86_64-apple-darwin':
     me = mac64
 elif triple == 'i686-w64-mingw32':
-    triple = 'i686-pc-mingw32'
     me = win32
 elif triple == 'x86_64-w64-mingw32':
-    triple = 'i686-pc-mingw32'
-    me = win32
+    me = win64
 else:
     raise Exception("no snapshot for the triple: " + triple)
 

src/etc/print-new-snapshot.py

@@ -16,7 +16,8 @@
     'macos-x86_64': 'x86_64-apple-darwin',
     'linux-i386': 'i686-unknown-linux-gnu',
     'linux-x86_64': 'x86_64-unknown-linux-gnu',
-    'winnt-i386': 'i686-pc-mingw32',
+    'winnt-i386': 'i686-w64-mingw32',
+    'winnt-x86_64': 'x86_64-w64-mingw32',
 }
 
 for platform in sorted(snaps):

src/snapshots.txt

@@ -1,3 +1,11 @@
+2014-09-19
+  linux-i386 c92895421e6fa170dbd713e74334b8c3cf22b817
+  linux-x86_64 66ee4126f9e4820cd82e78181931f8ea365904de
+  macos-i386 e2364b1f1ece338b9fc4c308c472fc2413bff04e
+  macos-x86_64 09f92f06ab4f048acf71d83dc0426ff1509779a9
+  winnt-i386 0c9b75d5b9ca58a7e39290fbe9c54d91db65c42c
+  winnt-x86_64 180c547aa79ba3069852450a6e833b577c7d4c3d
+
 2014-09-11
   linux-i386 f18823de75413ab72df91deb9b3b341c02005b2e
   linux-x86_64 58d9789472dd955be94903cafd406ce394915297