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.

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 0cc5d0b8174630c0425c81b4d8ae58999fa5e0e3..bc34ef804f21b24169443f25bea21d773f74f181 100644 (file)
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -55,9 +55,10 @@ ERROR: can't-deploy-library-file library ;
         deploy-threads? get [ "threads" , ] when
         "compiler" ,
         deploy-help? get [ "help" , ] when
+        native-io? [ "io" , ] when
         deploy-ui? get [ "ui" , ] when
         deploy-unicode? get [ "unicode" , ] when
-        native-io? [ "io" , ] when
+
     ] { } make ;
 
 : staging-image-name ( profile -- name )
@@ -101,7 +102,6 @@ DEFER: ?make-staging-image
 : deploy-command-line ( image vocab manifest-file config -- flags )
     [
         bootstrap-profile ?make-staging-image
-
         [
             "-i=" bootstrap-profile staging-image-name append ,
             "-resource-path=" "" resource-path append ,

diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 8f1b838f516dde9262f0cf017751f8dd2e61d3fb..b36baea2567abf46f7532de6c6d05b6df6c705fc 100644 (file)
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -26,7 +26,7 @@ cache-directory [
 
 [ ] [ "hello-ui" shake-and-bake 1400000 small-enough? ] unit-test
 
-[ "math-threads-compiler-ui" ] [
+[ "math-threads-compiler-io-ui" ] [
     "hello-ui" deploy-config [
         bootstrap-profile staging-image-name file-name
         "." split second

diff --git a/extra/benchmark/ui-panes/deploy.factor b/extra/benchmark/ui-panes/deploy.factor
index 90bd34bd3af1ed0911d70f412da2c232c39f026a..28cc3528636b4c16c9489e5fec175acd923b65e3 100644 (file)
--- a/extra/benchmark/ui-panes/deploy.factor
+++ b/extra/benchmark/ui-panes/deploy.factor
@@ -4,7 +4,7 @@ H{
     { deploy-word-defs? f }
     { deploy-threads? t }
     { deploy-math? t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { deploy-unicode? f }
     { "stop-after-last-window?" t }

diff --git a/extra/chicago-talk/deploy.factor b/extra/chicago-talk/deploy.factor
index 0ef255185187e2d5f5327a1aa166631ecb949505..ce8739ea3412f6c9ec8a27c6e59f5757a1d3d6f3 100644 (file)
--- a/extra/chicago-talk/deploy.factor
+++ b/extra/chicago-talk/deploy.factor
@@ -1,7 +1,7 @@
 USING: tools.deploy.config ;
 V{
     { deploy-ui? t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { deploy-math? t }
     { deploy-word-props? f }

diff --git a/extra/color-picker/deploy.factor b/extra/color-picker/deploy.factor
index 1c24d9eacbe5bfe235b32275a5e757b37231dceb..3c4ac8ebb38d88b36f7c3132648b93e03c75ec83 100644 (file)
--- a/extra/color-picker/deploy.factor
+++ b/extra/color-picker/deploy.factor
@@ -7,7 +7,7 @@ H{
     { deploy-unicode? f }
     { deploy-c-types? f }
     { deploy-word-defs? f }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
     { deploy-math? t }

diff --git a/extra/game/input/demos/joysticks/deploy.factor b/extra/game/input/demos/joysticks/deploy.factor
index 8ef5231362e96d0cd3f2b20bcbc86ae79422c668..a16361d5e6a8831a626494f321e9fdff6e514456 100644 (file)
--- a/extra/game/input/demos/joysticks/deploy.factor
+++ b/extra/game/input/demos/joysticks/deploy.factor
@@ -1,7 +1,7 @@
 USING: tools.deploy.config ;
 H{
     { deploy-name "joystick-demo" }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-word-defs? f }
     { deploy-c-types? t }
     { deploy-word-props? f }

diff --git a/extra/gesture-logger/deploy.factor b/extra/gesture-logger/deploy.factor
index 124e2f0437467122a351660115d8abdb760818a7..9e6387b9b3ee08dd618e0aeeae5ef0387c8ae112 100644 (file)
--- a/extra/gesture-logger/deploy.factor
+++ b/extra/gesture-logger/deploy.factor
@@ -1,7 +1,7 @@
 USING: tools.deploy.config ;
 V{
     { deploy-ui? t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-reflection 3 }
     { deploy-math? t }
     { deploy-word-props? f }

diff --git a/extra/gpu/demos/raytrace/deploy.factor b/extra/gpu/demos/raytrace/deploy.factor
index 2fec4f861f3f5410a5d6ea8cca65c826c7045aaa..3ac43ec4f0266ab384f320de5cacaa9ab89faf6d 100644 (file)
--- a/extra/gpu/demos/raytrace/deploy.factor
+++ b/extra/gpu/demos/raytrace/deploy.factor
@@ -6,7 +6,7 @@ H{
     { deploy-console? f }
     { deploy-unicode? f }
     { "stop-after-last-window?" t }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-reflection 2 }
     { deploy-word-props? f }
     { deploy-math? t }

diff --git a/extra/hello-ui/deploy.factor b/extra/hello-ui/deploy.factor
index ceff9857cb4b9e77e1af419521a67526281b7a4e..c3a5f900c51e096ab2468f32b9d6d9f0c3790aa1 100644 (file)
--- a/extra/hello-ui/deploy.factor
+++ b/extra/hello-ui/deploy.factor
@@ -5,7 +5,7 @@ H{
     { deploy-c-types? f }
     { deploy-unicode? f }
     { "stop-after-last-window?" t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { deploy-word-props? f }
     { deploy-math? t }

diff --git a/extra/hello-unicode/deploy.factor b/extra/hello-unicode/deploy.factor
index 106817aa5077251e1f84cb3dd3182b122177fa34..bb96a14fd4ff56900e510d6e1b2efa0b08998af7 100644 (file)
--- a/extra/hello-unicode/deploy.factor
+++ b/extra/hello-unicode/deploy.factor
@@ -9,6 +9,6 @@ H{
     { deploy-name "hello-unicode" }
     { deploy-math? t }
     { deploy-ui? t }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-c-types? f }
 }

diff --git a/extra/maze/deploy.factor b/extra/maze/deploy.factor
index 9f5795d55ac82fe0779edd4298f6cab479b3f2d1..6af1e9d8ed04e69dc5d5553960d6898f186ddb55 100644 (file)
--- a/extra/maze/deploy.factor
+++ b/extra/maze/deploy.factor
@@ -4,7 +4,7 @@ H{
     { deploy-reflection 1 }
     { deploy-unicode? f }
     { deploy-math? t }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-c-types? f }
     { deploy-name "Maze" }
     { deploy-word-props? f }

diff --git a/extra/merger/deploy.factor b/extra/merger/deploy.factor
index 39a73eab82399b3ac83784c40b1b784de52179fa..9f6816dec7e8df639d0d2775b329bf8f470127eb 100644 (file)
--- a/extra/merger/deploy.factor
+++ b/extra/merger/deploy.factor
@@ -10,5 +10,5 @@ H{
     { deploy-math? t }
     { deploy-ui? t }
     { deploy-word-props? f }
-    { deploy-io 2 }
+    { deploy-io 3 }
 }

diff --git a/extra/minneapolis-talk/deploy.factor b/extra/minneapolis-talk/deploy.factor
index c74ff304871abeebf9eebb1ceafe45bc2bc8c9c5..ea200ce7e649cc957ce23318d17b2b7ac7ea815c 100644 (file)
--- a/extra/minneapolis-talk/deploy.factor
+++ b/extra/minneapolis-talk/deploy.factor
@@ -1,7 +1,7 @@
 USING: tools.deploy.config ;
 V{
     { deploy-ui? t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { deploy-math? t }
     { deploy-word-props? f }

diff --git a/extra/nehe/deploy.factor b/extra/nehe/deploy.factor
index 2d6bdec8a837cd57bd4f6ded0ccc4aa49a4fb57d..7ef3c229b2ab20f990df4de2c78ad1b39736db51 100644 (file)
--- a/extra/nehe/deploy.factor
+++ b/extra/nehe/deploy.factor
@@ -1,7 +1,7 @@
 USING: tools.deploy.config ;
 V{
     { deploy-ui? t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { deploy-math? t }
     { deploy-word-props? f }

diff --git a/extra/spheres/deploy.factor b/extra/spheres/deploy.factor
index 8c72e4a26ca260547cbe55519d36ef588ed2d301..2eb644a0acc81ce2578f5c4e9d59dc1567f91767 100644 (file)
--- a/extra/spheres/deploy.factor
+++ b/extra/spheres/deploy.factor
@@ -8,7 +8,7 @@ H{
     { deploy-reflection 1 }
     { deploy-ui? t }
     { deploy-math? t }
-    { deploy-io 1 }
+    { deploy-io 3 }
     { deploy-word-props? f }
     { deploy-threads? t }
 }

diff --git a/extra/terrain/deploy.factor b/extra/terrain/deploy.factor
index 42e2fd68ab22dab84e3661ad8aa725888eb22901..e4e0a3bca91ace9f60693cd0bc7ddfb7e73814b4 100644 (file)
--- a/extra/terrain/deploy.factor
+++ b/extra/terrain/deploy.factor
@@ -4,7 +4,7 @@ H{
     { deploy-ui? t }
     { deploy-c-types? f }
     { deploy-unicode? f }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
     { deploy-word-props? f }

diff --git a/extra/tetris/deploy.factor b/extra/tetris/deploy.factor
index a2d71ab08bf9302c2fa463557157a584765b310e..96259d1474021fad481508ae5d9948249724853f 100644 (file)
--- a/extra/tetris/deploy.factor
+++ b/extra/tetris/deploy.factor
@@ -5,7 +5,7 @@ H{
     { deploy-word-props? f }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
-    { deploy-io 2 }
+    { deploy-io 3 }
     { deploy-math? t }
     { deploy-word-defs? f }
     { deploy-c-types? f }