From bd93e1abcda185e18a7e008a70ec2840397f94f4 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 17 Jun 2011 18:17:15 -0700
Subject: [PATCH] Register new snapshots. Update location of stage0's libstd

---
 Makefile.in             | 7 ++++---
 mk/clean.mk             | 2 +-
 mk/stage0.mk            | 3 ++-
 mk/stage1.mk            | 4 ++--
 src/etc/get-snapshot.py | 2 +-
 src/etc/snapshot.py     | 9 ---------
 src/snapshots.txt       | 5 +++++
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4dfda256988..d693d7d5100 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,7 +148,8 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
 ######################################################################
 
 LREQ := rt/$(CFG_RUNTIME) rustllvm/$(CFG_RUSTLLVM)
-SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/glue.o stage0/$(CFG_STDLIB)
+SREQ0 := stage0/rustc$(X) $(LREQ) rt/main.o stage0/glue.o \
+         stage0/lib/$(CFG_STDLIB)
 SREQ1 := stage1/rustc$(X) $(LREQ) rt/main.o stage1/glue.o \
          stage1/lib/$(CFG_STDLIB)
 SREQ2 := stage2/rustc$(X) $(LREQ) rt/main.o stage2/glue.o \
@@ -184,7 +185,7 @@ CFG_INFO := $(info cfg:)
 
 all: rt/$(CFG_RUNTIME)          \
      rustllvm/$(CFG_RUSTLLVM)   \
-     stage0/$(CFG_STDLIB)       \
+     stage0/lib/$(CFG_STDLIB)   \
      stage0/intrinsics.bc       \
      stage0/rustc$(X)           \
      $(GENERATED)               \
@@ -198,7 +199,7 @@ else
 
 all: rt/$(CFG_RUNTIME)          \
      rustllvm/$(CFG_RUSTLLVM)   \
-     stage0/$(CFG_STDLIB)       \
+     stage0/lib/$(CFG_STDLIB)   \
      stage0/intrinsics.bc       \
      stage0/rustc$(X)           \
      $(GENERATED)               \
diff --git a/mk/clean.mk b/mk/clean.mk
index 15cef4c408b..13240ed8184 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -22,7 +22,7 @@ clean:
 	$(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp)
 	$(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
 	$(Q)rm -f $(GENERATED)
-	$(Q)rm -f stage0/rustc$(X) stage0/$(CFG_STDLIB)
+	$(Q)rm -f stage0/rustc$(X) stage0/lib/$(CFG_STDLIB)
 	$(Q)rm -f stage1/rustc$(X) stage1/lib/$(CFG_STDLIB) stage1/glue*
 	$(Q)rm -f stage2/rustc$(X) stage2/lib/$(CFG_STDLIB) stage2/glue*
 	$(Q)rm -f stage3/rustc$(X) stage3/lib/$(CFG_STDLIB) stage3/glue*
diff --git a/mk/stage0.mk b/mk/stage0.mk
index e79ae8435f9..5f32e2e7be5 100644
--- a/mk/stage0.mk
+++ b/mk/stage0.mk
@@ -1,5 +1,6 @@
 stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
 	@$(call E, fetch: $@)
+	mkdir -p stage0/lib
 	$(Q)$(S)src/etc/get-snapshot.py
 	$(Q)touch $@
 
@@ -8,7 +9,7 @@ stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
 stage0/glue.o: stage0/rustc$(X)
 	$(Q)touch $@
 
-stage0/$(CFG_STDLIB): stage0/rustc$(X)
+stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
 	$(Q)touch $@
 
 # TODO: Include as part of the snapshot.
diff --git a/mk/stage1.mk b/mk/stage1.mk
index 17b1984bc54..e83d3ae1747 100644
--- a/mk/stage1.mk
+++ b/mk/stage1.mk
@@ -1,11 +1,11 @@
 stage1/lib/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
-              stage1/rustc$(X) stage0/$(CFG_STDLIB) stage1/intrinsics.bc \
+              stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
               stage1/glue.o $(LREQ) $(MKFILES)
 	@$(call E, compile_and_link: $@)
 	mkdir -p stage1/lib
 	$(STAGE1)  --shared -o $@ $<
 
-stage1/glue.o: stage1/rustc$(X) stage0/$(CFG_STDLIB) stage1/intrinsics.bc \
+stage1/glue.o: stage1/rustc$(X) stage0/lib/$(CFG_STDLIB) stage1/intrinsics.bc \
                $(LREQ) $(MKFILES)
 	@$(call E, generate: $@)
 	$(STAGE1) -c -o $@ --glue
diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index aa64a4fb49a..98e480defda 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 old_snapshot_files[kernel]:
+  for name in 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 afa88cec5b3..e567de5ab68 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -21,15 +21,6 @@ snapshot_files = {
     "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" ]
-    }
-
 def parse_line(n, line):
   global snapshotfile
 
diff --git a/src/snapshots.txt b/src/snapshots.txt
index 1226f4504c3..36590a0001c 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,8 @@
+S 2011-06-17 175fd8e
+  linux-i386 ba92b05deee82f2d8f954cf014de1faec1167e36
+  macos-i386 6bacf4769deda26b614b4ba36bcb46f65649cce0
+  winnt-i386 057c6ae72ec2059806e33bc3578c71534779eac5
+
 S 2011-06-16 15f71b3
   linux-i386 c81ac692140484ee8944ab50ca69347abdca30b4
   macos-i386 ac27541e4438956cb29bd70c8d353c487a315634