From 175fd8ee73743a08174b5fa7203798008c927fea Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 17 Jun 2011 15:35:38 -0700 Subject: [PATCH] Update snapshot scripts to understand new dir layout --- src/etc/get-snapshot.py | 2 +- src/etc/snapshot.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 26015a5427f5..afa88cec5b3e 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -16,6 +16,15 @@ download_dir_base = "dl" download_unpack_base = os.path.join(download_dir_base, "unpack") snapshot_files = { + "linux": ["rustc", "glue.o", "lib/libstd.so" ], + "macos": ["rustc", "glue.o", "lib/libstd.dylib" ], + "winnt": ["rustc.exe", "glue.o", "lib/std.dll" ] + } + +# This is a transitional list of files so that the unpacker knows to +# use the old directory layout and the snapshotter knows to use the +# new directory layout +old_snapshot_files = { "linux": ["rustc", "glue.o", "libstd.so" ], "macos": ["rustc", "glue.o", "libstd.dylib" ], "winnt": ["rustc.exe", "glue.o", "std.dll" ]