Skip to content

Commit

Permalink
Use new snapshot.
Browse files Browse the repository at this point in the history
  • Loading branch information
cixtor committed Jul 11, 2011
1 parent 64ad592 commit 15a670a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
7 changes: 2 additions & 5 deletions mk/stage0.mk
Expand Up @@ -11,8 +11,5 @@ stage0/lib/glue.o: stage0/rustc$(X)
stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
$(Q)touch $@

# TODO: Include as part of the snapshot.
stage0/intrinsics.bc: $(INTRINSICS_BC)
@$(call E, cp: $@)
$(Q)cp $< $@

stage0/intrinsics.bc: stage0/rustc$(X)
$(Q)touch $@
2 changes: 1 addition & 1 deletion src/etc/get-snapshot.py
Expand Up @@ -9,7 +9,7 @@ def unpack_snapshot(snap):
print("opening snapshot " + dl_path)
tar = tarfile.open(dl_path)
kernel = get_kernel()
for name in old_snapshot_files[kernel]:
for name in snapshot_files[kernel]:
p = "rust-stage0/" + name
fp = os.path.join("stage0", name)
print("extracting " + fp)
Expand Down
9 changes: 0 additions & 9 deletions src/etc/snapshot.py
Expand Up @@ -15,15 +15,6 @@ def scrub(b):
download_dir_base = "dl"
download_unpack_base = os.path.join(download_dir_base, "unpack")

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",
"lib/librustrt.dylib", "lib/librustllvm.dylib"],
"winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib",
"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"],
Expand Down
5 changes: 5 additions & 0 deletions src/snapshots.txt
@@ -1,3 +1,8 @@
S 2011-07-11 f666c97
linux-i386 434346526e3feecf80ceb58f132fb4ea6cbfec0a
macos-i386 f643f88b1414bf43c1821a9d3eea0bdc8df2f68d
winnt-i386 67e09bf1fb2ae0894cfc99fabee1ed716f218486

S 2011-07-09 f42c947
linux-i386 9cb82d02baaccc6efc1b5dff5f3d41aa0c8546e8
macos-i386 5fd5b3fff6bdaaffc5a55d208370d3764076b54e
Expand Down

0 comments on commit 15a670a

Please sign in to comment.