From f666c97e6dec25f1894cf9e39bfe89f2a5d8fde3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Mon, 11 Jul 2011 12:09:52 -0400 Subject: [PATCH] Step 1/n for moving to the new type system: include intrinsics.bc in the snapshot. --- src/etc/get-snapshot.py | 2 +- src/etc/snapshot.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py index 98e480defda1..aa64a4fb49a1 100755 --- a/src/etc/get-snapshot.py +++ b/src/etc/get-snapshot.py @@ -9,7 +9,7 @@ def unpack_snapshot(snap): print("opening snapshot " + dl_path) tar = tarfile.open(dl_path) kernel = get_kernel() - for name in snapshot_files[kernel]: + for name in old_snapshot_files[kernel]: p = "rust-stage0/" + name fp = os.path.join("stage0", name) print("extracting " + fp) diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py index 9860af9df8ef..dadd4da24bc9 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -15,7 +15,7 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots" download_dir_base = "dl" download_unpack_base = os.path.join(download_dir_base, "unpack") -snapshot_files = { +old_snapshot_files = { "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib", "lib/librustrt.so", "lib/librustllvm.so"], "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib", @@ -24,6 +24,15 @@ snapshot_files = { "lib/rustrt.dll", "lib/rustllvm.dll"] } +snapshot_files = { + "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib", + "lib/librustrt.so", "lib/librustllvm.so", "intrinsics.bc"], + "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib", + "lib/librustrt.dylib", "lib/librustllvm.dylib", "intrinsics.bc"], + "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib", + "lib/rustrt.dll", "lib/rustllvm.dll", "intrinsics.bc"] + } + def parse_line(n, line): global snapshotfile