steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootstrap.stage2: deploy-vocab is never set when running the stage2 process

char-rename
Björn Lindqvist 2016-09-16 14:54:04 +02:00
parent 8368727f8a
commit 6cced7dcbf
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/bootstrap/compiler/compiler.factor
View File

@ -11,7 +11,7 @@ IN: bootstrap.compiler
! Don't bring this in when deploying, since it will store a ! Don't bring this in when deploying, since it will store a
! reference to 'eval' in a global variable ! reference to 'eval' in a global variable
"deploy-vocab" get "staging" get or [ "staging" get [
"alien.remote-control" require "alien.remote-control" require
] unless ] unless

6
basis/bootstrap/stage2.factor
View File

@ -78,7 +78,7 @@ CONSTANT: default-components
! Set dll paths ! Set dll paths
os windows? [ "windows" require ] when os windows? [ "windows" require ] when
"staging" get "deploy-vocab" get or [ "staging" get [
"stage2: deployment mode" print "stage2: deployment mode" print
] [ ] [
"debugger" require "debugger" require
@ -95,9 +95,6 @@ CONSTANT: default-components
nano-count swap - bootstrap-time set-global nano-count swap - bootstrap-time set-global
print-report print-report
"deploy-vocab" get [
"tools.deploy.shaker" run
] [
"staging" get [ "staging" get [
"vocab:bootstrap/finish-staging.factor" run-file "vocab:bootstrap/finish-staging.factor" run-file
] [ ] [
@ -108,7 +105,6 @@ CONSTANT: default-components
f original-error set-global f original-error set-global
f error-continuation set-global f error-continuation set-global
"output-image" get save-image-and-exit "output-image" get save-image-and-exit
] if
] [ ] [
drop drop
[ [