OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Register new snapshots. Update location of stage0's libstd

Browse Source
This commit is contained in:
Brian Anderson 2011-06-17 18:17:15 -07:00
parent e0afcb400b
commit bd93e1abcd
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -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) \

2
mk/clean.mk
View File

@ -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*

3
mk/stage0.mk
View File

@ -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.

4
mk/stage1.mk
View File

@ -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

2
src/etc/get-snapshot.py
View File

@ -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)

9
src/etc/snapshot.py
View File

@ -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

5
src/snapshots.txt
View File

@ -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