io.encodings.utf16: add a utf16n word for native utf16 type.

[factor.git] / basis / bootstrap / stage2.factor

diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
index 320d853f1b6abb992540e712096e934cf9656411..8ff0d37d59edf231cdf60d9c880a5715c8def329 100644 (file)
--- a/basis/bootstrap/stage2.factor
+++ b/basis/bootstrap/stage2.factor
@@ -13,10 +13,8 @@ SYMBOL: bootstrap-time
 : strip-encodings ( -- )
     os unix? [
         [
-            P" resource:core/io/encodings/utf16/utf16.factor"
-            P" resource:core/io/encodings/utf16n/utf16n.factor" [ forget ] bi@
-            "io.encodings.utf16"
-            "io.encodings.utf16n" [ loaded-child-vocab-names [ forget-vocab ] each ] bi@
+            P" resource:core/io/encodings/utf16/utf16.factor" forget
+            "io.encodings.utf16" loaded-child-vocab-names [ forget-vocab ] each
         ] with-compilation-unit
     ] when ;
 
@@ -78,12 +76,11 @@ CONSTANT: default-components
     ! Set dll paths
     os windows? [ "windows" require ] when
 
-    "staging" get "deploy-vocab" get or [
+    "staging" get [
         "stage2: deployment mode" print
     ] [
         "debugger" require
         "listener" require
-        "none" require
     ] if
 
     load-components
@@ -95,20 +92,16 @@ CONSTANT: default-components
     nano-count swap - bootstrap-time set-global
     print-report
 
-    "deploy-vocab" get [
-        "tools.deploy.shaker" run
+    "staging" get [
+        "vocab:bootstrap/finish-staging.factor" run-file
     ] [
-        "staging" get [
-            "vocab:bootstrap/finish-staging.factor" run-file
-        ] [
-            "vocab:bootstrap/finish-bootstrap.factor" run-file
-        ] if
-
-        f error set-global
-        f original-error set-global
-        f error-continuation set-global
-        "output-image" get save-image-and-exit
+        "vocab:bootstrap/finish-bootstrap.factor" run-file
     ] if
+
+    f error set-global
+    f original-error set-global
+    f error-continuation set-global
+    "output-image" get save-image-and-exit
 ] [
     drop
     [