tools.deploy.backend: ui depends on (full) io so it needs to be loaded first

find-library on linux needs to call /sbin/ldconfig which requires a
full io-backend. Using gtk requires loading alien libraries which
requires find-library. So the ui should always load the whole io.
db4
Björn Lindqvist 2014-06-20 15:09:47 +02:00 committed by Doug Coleman
parent 5d44509720
commit 508b85851d
17 changed files with 18 additions and 18 deletions

View File

@ -55,9 +55,10 @@ ERROR: can't-deploy-library-file library ;
deploy-threads? get [ "threads" , ] when deploy-threads? get [ "threads" , ] when
"compiler" , "compiler" ,
deploy-help? get [ "help" , ] when deploy-help? get [ "help" , ] when
native-io? [ "io" , ] when
deploy-ui? get [ "ui" , ] when deploy-ui? get [ "ui" , ] when
deploy-unicode? get [ "unicode" , ] when deploy-unicode? get [ "unicode" , ] when
native-io? [ "io" , ] when
] { } make ; ] { } make ;
: staging-image-name ( profile -- name ) : staging-image-name ( profile -- name )
@ -101,7 +102,6 @@ DEFER: ?make-staging-image
: deploy-command-line ( image vocab manifest-file config -- flags ) : deploy-command-line ( image vocab manifest-file config -- flags )
[ [
bootstrap-profile ?make-staging-image bootstrap-profile ?make-staging-image
[ [
"-i=" bootstrap-profile staging-image-name append , "-i=" bootstrap-profile staging-image-name append ,
"-resource-path=" "" resource-path append , "-resource-path=" "" resource-path append ,

View File

@ -26,7 +26,7 @@ cache-directory [
[ ] [ "hello-ui" shake-and-bake 1400000 small-enough? ] unit-test [ ] [ "hello-ui" shake-and-bake 1400000 small-enough? ] unit-test
[ "math-threads-compiler-ui" ] [ [ "math-threads-compiler-io-ui" ] [
"hello-ui" deploy-config [ "hello-ui" deploy-config [
bootstrap-profile staging-image-name file-name bootstrap-profile staging-image-name file-name
"." split second "." split second

View File

@ -4,7 +4,7 @@ H{
{ deploy-word-defs? f } { deploy-word-defs? f }
{ deploy-threads? t } { deploy-threads? t }
{ deploy-math? t } { deploy-math? t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-unicode? f } { deploy-unicode? f }
{ "stop-after-last-window?" t } { "stop-after-last-window?" t }

View File

@ -1,7 +1,7 @@
USING: tools.deploy.config ; USING: tools.deploy.config ;
V{ V{
{ deploy-ui? t } { deploy-ui? t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-math? t } { deploy-math? t }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -7,7 +7,7 @@ H{
{ deploy-unicode? f } { deploy-unicode? f }
{ deploy-c-types? f } { deploy-c-types? f }
{ deploy-word-defs? f } { deploy-word-defs? f }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ "stop-after-last-window?" t } { "stop-after-last-window?" t }
{ deploy-math? t } { deploy-math? t }

View File

@ -1,7 +1,7 @@
USING: tools.deploy.config ; USING: tools.deploy.config ;
H{ H{
{ deploy-name "joystick-demo" } { deploy-name "joystick-demo" }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-word-defs? f } { deploy-word-defs? f }
{ deploy-c-types? t } { deploy-c-types? t }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -1,7 +1,7 @@
USING: tools.deploy.config ; USING: tools.deploy.config ;
V{ V{
{ deploy-ui? t } { deploy-ui? t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-reflection 3 } { deploy-reflection 3 }
{ deploy-math? t } { deploy-math? t }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -6,7 +6,7 @@ H{
{ deploy-console? f } { deploy-console? f }
{ deploy-unicode? f } { deploy-unicode? f }
{ "stop-after-last-window?" t } { "stop-after-last-window?" t }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-reflection 2 } { deploy-reflection 2 }
{ deploy-word-props? f } { deploy-word-props? f }
{ deploy-math? t } { deploy-math? t }

View File

@ -5,7 +5,7 @@ H{
{ deploy-c-types? f } { deploy-c-types? f }
{ deploy-unicode? f } { deploy-unicode? f }
{ "stop-after-last-window?" t } { "stop-after-last-window?" t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-word-props? f } { deploy-word-props? f }
{ deploy-math? t } { deploy-math? t }

View File

@ -9,6 +9,6 @@ H{
{ deploy-name "hello-unicode" } { deploy-name "hello-unicode" }
{ deploy-math? t } { deploy-math? t }
{ deploy-ui? t } { deploy-ui? t }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-c-types? f } { deploy-c-types? f }
} }

View File

@ -4,7 +4,7 @@ H{
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-unicode? f } { deploy-unicode? f }
{ deploy-math? t } { deploy-math? t }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-c-types? f } { deploy-c-types? f }
{ deploy-name "Maze" } { deploy-name "Maze" }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -10,5 +10,5 @@ H{
{ deploy-math? t } { deploy-math? t }
{ deploy-ui? t } { deploy-ui? t }
{ deploy-word-props? f } { deploy-word-props? f }
{ deploy-io 2 } { deploy-io 3 }
} }

View File

@ -1,7 +1,7 @@
USING: tools.deploy.config ; USING: tools.deploy.config ;
V{ V{
{ deploy-ui? t } { deploy-ui? t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-math? t } { deploy-math? t }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -1,7 +1,7 @@
USING: tools.deploy.config ; USING: tools.deploy.config ;
V{ V{
{ deploy-ui? t } { deploy-ui? t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-math? t } { deploy-math? t }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -8,7 +8,7 @@ H{
{ deploy-reflection 1 } { deploy-reflection 1 }
{ deploy-ui? t } { deploy-ui? t }
{ deploy-math? t } { deploy-math? t }
{ deploy-io 1 } { deploy-io 3 }
{ deploy-word-props? f } { deploy-word-props? f }
{ deploy-threads? t } { deploy-threads? t }
} }

View File

@ -4,7 +4,7 @@ H{
{ deploy-ui? t } { deploy-ui? t }
{ deploy-c-types? f } { deploy-c-types? f }
{ deploy-unicode? f } { deploy-unicode? f }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ "stop-after-last-window?" t } { "stop-after-last-window?" t }
{ deploy-word-props? f } { deploy-word-props? f }

View File

@ -5,7 +5,7 @@ H{
{ deploy-word-props? f } { deploy-word-props? f }
{ deploy-reflection 1 } { deploy-reflection 1 }
{ "stop-after-last-window?" t } { "stop-after-last-window?" t }
{ deploy-io 2 } { deploy-io 3 }
{ deploy-math? t } { deploy-math? t }
{ deploy-word-defs? f } { deploy-word-defs? f }
{ deploy-c-types? f } { deploy-c-types? f }