From de6d07abf9032f7838580993b46addea81af63d4 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 29 Sep 2011 22:29:44 -0700 Subject: [PATCH] Register snapshots and finish filesystem reorg --- mk/stage0.mk | 9 --------- mk/stageN.mk | 9 --------- src/etc/get-snapshot.py | 2 +- src/etc/snapshot.py | 10 ---------- src/snapshots.txt | 5 +++++ 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/mk/stage0.mk b/mk/stage0.mk index 44bee0ff88b..76f9ac5aee9 100644 --- a/mk/stage0.mk +++ b/mk/stage0.mk @@ -1,15 +1,6 @@ -# FIXME: We're temorarily moving stuff all over the place here to make -# the old snapshot compatible with the new build rules stage0/bin/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES) @$(call E, fetch: $@) $(Q)$(S)src/etc/get-snapshot.py - $(Q)cp stage0/rustc$(X) stage0/bin/rustc$(X) - $(Q)cp stage0/$(CFG_RUNTIME) stage0/lib/$(CFG_RUNTIME) - $(Q)cp stage0/$(CFG_RUSTLLVM) stage0/lib/$(CFG_RUSTLLVM) - $(Q)mkdir -p stage0/bin/lib - $(Q)cp stage0/lib/intrinsics.bc stage0/bin/lib/intrinsics.bc - $(Q)cp stage0/lib/glue.o stage0/bin/lib/glue.o - $(Q)cp stage0/lib/main.o stage0/bin/lib/main.o $(Q)touch $@ # Host libs will be made in the process of making rustc above. diff --git a/mk/stageN.mk b/mk/stageN.mk index bf390561c07..9ed9fa83653 100644 --- a/mk/stageN.mk +++ b/mk/stageN.mk @@ -27,13 +27,10 @@ stage$(2)/lib/%.o: stage$(2)/lib/%.s @$$(call E, assemble [gcc]: $$@) $$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$< -# FIXME: the bin/lib/libstd.so dep is transitional - stage$(2)/bin/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \ stage$(2)/lib/$$(CFG_RUNTIME) \ $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \ stage$(2)/lib/$$(CFG_RUSTLLVM) \ - stage$(1)/bin/lib/$$(CFG_STDLIB) \ $$(SREQ$(1)$(3)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)) -L stage$(2)/lib -o $$@ $$< @@ -97,12 +94,6 @@ stage$(2)/lib/rustc/$(3)/libstd.rlib: \ @$$(call E, compile_and_link: $$@) $$(STAGE$(2)) --lib --static -o $$@ $$< -# FIXME: Transitional so that stage0 can find std when building stage1/rustc -stage$(2)/bin/lib/$$(CFG_STDLIB): stage$(2)/lib/rustc/$(3)/$$(CFG_STDLIB) - @$$(call E, cp: $$@) - $$(Q)mkdir -p stage$(2)/bin/lib - $$(Q)cp $$< $$@ - stage$(2)/lib/rustc/$(3)/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ 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 8f718be4ff0..689e798e778 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -15,16 +15,6 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots" download_dir_base = "dl" download_unpack_base = os.path.join(download_dir_base, "unpack") -# FIXME: Transitional -old_snapshot_files = { - "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/main.o", - "librustrt.so", "librustllvm.so", "lib/intrinsics.bc"], - "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/main.o", - "librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"], - "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/main.o", - "rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"] - } - snapshot_files = { "linux": ["bin/rustc", "lib/libstd.so", "lib/librustrt.so", "lib/librustllvm.so"], diff --git a/src/snapshots.txt b/src/snapshots.txt index 1690a76e9e5..e981d72e180 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,8 @@ +S 2011-09-29 80829af + linux-i386 0bf17c8bfdf7e3400cd546577d4f57b7be821441 + macos-i386 9b40e0c830396469811e9e6e0b430d0d51876a27 + winnt-i386 735b189037ab45d88f937cbe391c4e30aaf1182b + S 2011-09-28 a3a2737 linux-i386 d255b2ec7205209b7d7fe71be84def6306491387 macos-i386 1ff3b71ccfc7e404c813b68a7a257406f292b819