From 548fe0eda9200104e39ad3ec5fcb9e0ea7e643a0 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 13 Dec 2011 10:54:48 -0800
Subject: [PATCH] Register new snapshots and teach snapshot script to deal with
 extracting new-style versioned snapshots.

---
 src/etc/get-snapshot.py | 24 +++---------------------
 src/snapshots.txt       |  7 +++++++
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index b42a76350d99..1b314a049d97 100755
--- a/src/etc/get-snapshot.py
+++ b/src/etc/get-snapshot.py
@@ -3,34 +3,16 @@
 import os, tarfile, hashlib, re, shutil, sys
 from snapshot import *
 
-old_snapshot_files = {
-    "linux": ["bin/rustc",
-              "lib/libcore.so",
-              "lib/libruststd.so",
-              "lib/librustrt.so",
-              "lib/librustllvm.so"],
-    "macos": ["bin/rustc",
-              "lib/libcore.dylib",
-              "lib/libruststd.dylib",
-              "lib/librustrt.dylib",
-              "lib/librustllvm.dylib"],
-    "winnt": ["bin/rustc.exe",
-              "lib/core.dll",
-              "lib/ruststd.dll",
-              "lib/rustrt.dll",
-              "lib/rustllvm.dll"]
-    }
-
 def unpack_snapshot(triple, snap):
   dl_path = os.path.join(download_dir_base, snap)
   print("opening snapshot " + dl_path)
   tar = tarfile.open(dl_path)
   kernel = get_kernel(triple)
-  for name in old_snapshot_files[kernel]:
-    p = "rust-stage0/" + name
+  for p in tar.getnames():
+    name = p.replace("rust-stage0/", "", 1);
     stagep = os.path.join(triple, "stage0")
     fp = os.path.join(stagep, name)
-    print("extracting " + fp)
+    print("extracting " + p)
     tar.extract(p, download_unpack_base)
     tp = os.path.join(download_unpack_base, p)
     shutil.move(tp, fp)
diff --git a/src/snapshots.txt b/src/snapshots.txt
index fe0e65bc240f..45666ad8a770 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,10 @@
+S 2011-12-12 1c1bc2f
+  winnt-i386 550dc539e8ab6837c52b3a35e6119061490190b1
+  linux-i386 66c5e97e3072d8c88a52d986d1fadbd43de615a5
+  macos-i386 c3db65606d7bbea2ae0482b20e177f7463dc58ef
+  linux-x86_64 c5bbd08e423844ee938c8f6824ba2b3b4dc851b0
+  macos-x86_64 29accda0ace162169408357371482ddd044b6dd3
+
 S 2011-12-07 3ccdd2a
   linux-i386 7c639851d8a4ae43f781ad4592b6d3b6e0f4837b
   macos-i386 8fdf95481943aff1953d93eed31528c221d33373