Skip to content

Commit

Permalink
Update bootstrap with setting loading in the compiled code.
Browse files Browse the repository at this point in the history
  • Loading branch information
jnthn committed Mar 8, 2011
1 parent 5cd263b commit 4b97ed3
Show file tree
Hide file tree
Showing 7 changed files with 32,534 additions and 30,858 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ nqp_group.c
nqp_group.h
nqp.pbc
NQPCORE.setting.pbc
SettingManager.pbc
src/gen/*.pir
src/gen/*.nqp
src/gen/*.pm
Expand Down
4 changes: 3 additions & 1 deletion build/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ NQP_EXE = nqp$(EXE)
CORE_SETTING_PBC = NQPCORE.setting.pbc
CORE_SETTING_PIR = gen/NQPCORE.setting.pir

STAGE0_PBCS = $(STAGE0)/$(HLL_PBC) $(STAGE0)/$(P6REGEX_PBC) $(STAGE0)/$(NQP_PBC) $(STAGE0)/$(REGEX_PBC) $(STAGE0)/$(CORE_SETTING_PBC)
STAGE0_PBCS = $(STAGE0)/$(HLL_PBC) $(STAGE0)/$(P6REGEX_PBC) $(STAGE0)/$(NQP_PBC) $(STAGE0)/$(REGEX_PBC) $(STAGE0)/$(CORE_SETTING_PBC) $(STAGE0)/$(SETTING_MANAGER_PBC)
STAGE1_PBCS = $(STAGE1)/$(HLL_PBC) $(STAGE1)/$(P6REGEX_PBC) $(STAGE1)/$(NQP_PBC) $(REGEX_PBC) $(STAGE1)/$(CORE_SETTING_PBC) $(STAGE1)/$(SETTING_MANAGER_PBC)
STAGE2_PBCS = $(STAGE2)/$(HLL_PBC) $(STAGE2)/$(P6REGEX_PBC) $(STAGE2)/$(NQP_PBC) $(REGEX_PBC) $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(SETTING_MANAGER_PBC)
ALL_PBCS = $(HLL_PBC) $(P6REGEX_PBC) $(NQP_PBC) $(CORE_SETTING_PBC) $(SETTING_MANAGER_PBC)
Expand Down Expand Up @@ -250,6 +250,7 @@ $(STAGE0_PBCS): $(DYNEXT_TARGET) $(STAGE0_SOURCES)
$(PARROT) -o $(STAGE0)/$(P6REGEX_PBC) src/stage0/P6Regex-s0.pir
$(PARROT) -o $(STAGE0)/$(NQP_PBC) src/stage0/NQP-s0.pir
$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/stage0/NQPCORE.setting-s0.pir
$(PARROT) -o $(STAGE0)/$(SETTING_MANAGER_PBC) src/stage0/SettingManager-s0.pir

$(STAGE1): $(STAGE1_PBCS)

Expand Down Expand Up @@ -435,6 +436,7 @@ bootstrap-files: $(STAGE2_PBCS) src/stage2/$(CORE_SETTING_NQP)
$(PERL) build/gen_bootstrap.pl src/Regex/P6Regex.pir >src/stage0/P6Regex-s0.pir
$(PERL) build/gen_bootstrap.pl src/NQP/Compiler.pir >src/stage0/NQP-s0.pir
$(PERL) build/gen_bootstrap.pl src/stage2/$(CORE_SETTING_PIR) >src/stage0/NQPCORE.setting-s0.pir
$(PERL) build/gen_bootstrap.pl src/stage2/gen/setting_manager.pir >src/stage0/SettingManager-s0.pir


## testing
Expand Down
Loading

0 comments on commit 4b97ed3

Please sign in to comment.