Use the 'toit' executable instead of the sub-programs.

Author: floitsch

docs/language/index.mdx

@@ -44,11 +44,11 @@ you add to your programs are significant.
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 Hello World!
 ```
 
-What just happened? The `toit.run` command line tool read your source code
+What just happened? The `toit` command line tool read your source code
 (`hello.toit`) and started running it from the `main` method that you defined.
 The `main` method consists of all the indented statements just below the method
 declaration line `main:`. Toit is indentation-based like Python, so the spaces
@@ -82,7 +82,7 @@ Hello World!
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 Hello World!
 Hello World!
 ```
@@ -138,7 +138,7 @@ Hello Kasper!
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 Hello Lars!
 Hello Kasper!
 ```
@@ -195,7 +195,7 @@ Hello Kasper!
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 Hello World!
 Hello Kasper!
 ```
@@ -274,7 +274,7 @@ Bye Helena, come back soon.
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 Hi Helena!
 Bye Helena, come back soon.
 ```
@@ -403,7 +403,7 @@ The names are [World]
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 The names are [World]
 ```
 </Tab>
@@ -459,7 +459,7 @@ Bye World, Lars, Kasper, Rikke, come back soon.
 <Tab label="toitlang.org">
 
 ```txt
-$ toit.run hello.toit
+$ toit hello.toit
 Hello World!
 Bye World, come back soon.
 Hello World!

docs/language/package/pkgtutorial.mdx

@@ -365,14 +365,14 @@ jag run -d host morse_test.toit
 
 ```shell
 # In the test directory:
-toit.pkg init
-toit.pkg install --local --name=morse-tutorial ..
+toit pkg init
+toit pkg install --local --name=morse-tutorial ..
 ```
 
 The test should then execute successfully by running it locally:
 
 ```shell
-toit.run morse_test.toit
+toit morse_test.toit
 ```
 </Tab>
 </Tabs>
@@ -403,7 +403,7 @@ dependencies:
     version: ^1.0.0
 ```
 
-You normally don't need to worry about them, as they are automatically added when running `jag pkg install <dependency>` or `toit.pkg install <dependency>`.
+You normally don't need to worry about them, as they are automatically added when running `jag pkg install <dependency>` or `toit pkg install <dependency>`.
 
 ## Publishing to the Toit package registry
 
@@ -423,7 +423,7 @@ Once published successfully, the registry will distribute a description of the p
 </Tab>
 <Tab label="toitlang.org">
 
-Once published successfully, the registry will distribute a description of the package so that anyone can start using the package with a simple `toit.pkg install`.
+Once published successfully, the registry will distribute a description of the package so that anyone can start using the package with a simple `toit pkg install`.
 </Tab>
 </Tabs>
 

docs/tutorials/containers/toit-sdk.mdx

@@ -10,35 +10,32 @@ Archlinux with `yay -S toit` (in which case the SDK can be found in
 [build from source](https://github.com/toitlang/toit). When building
 locally, the SDK is located at `build/host/sdk`.
 
-This tutorial assumes that Toit's firmware tool is
-available as `firmware`. This tool can be found in the SDK
-at `$SDK/tools/firmware`.
+This tutorial assumes that Toit's executable is
+available as `toit`. This tool can be found in the SDK
+at `$SDK/bin/toit`.
 
 It also assumes that a Toit firmware envelope is available as
 `firmware.envelope`. In a local build it is located at
 `build/esp32/firmware.envelope`. Each Toit release also has
 a corresponding firmware envelope available for download
 (for example `firmware-esp32.gz`).
 
-Finally, it assumes that the Toit compiler is available as `toit.compile`.
-This tool can be found in the SDK at `$SDK/bin/toit.compile`.
-
 ## Instructions
 Start by building a snapshot of the program you want to install.
 
 ``` shell
-toit.compile -w hello.snapshot hello.toit
+toit compile --snapshot -o hello.snapshot hello.toit
 ```
 
 Then add the snapshot to a firmware envelope.
 ``` shell
 # By using '-o' we don't modify the envelope but create a new one.
-firmware -e firmware.envelope container install -o hello.envelope hello hello.snapshot
+toit tool firmware -e firmware.envelope container install -o hello.envelope hello hello.snapshot
 ```
 
 The created envelope can be flashed to a device using the `flash` command.
 ``` shell
-firmware -e hello.envelope flash --port /dev/ttyUSB0 --baud 921600
+toit tool firmware -e hello.envelope flash --port /dev/ttyUSB0 --baud 921600
 ```
 
 When the device boots up, it will run the installed container.

docs/tutorials/misc/ota.mdx

@@ -19,8 +19,8 @@ first.
 A new firmware consists of updating a Toit firmware envelope with
 the desired containers and to build a binary image out of it.
 We will provide the necessary steps to create a new firmware, but
-you might need to update your setup to have the required tools
-(`toit.compile` and `firmware`) accessible. See the
+you might need to update your setup to have the required tool
+(`toit`) accessible. See the
 [containers tutorial](../../containers/toit-sdk) for how to
 set up your environment, and for more information on how containers
 and envelopes work.
@@ -108,16 +108,16 @@ You should now have a file called `firmware-esp32`.
 Compile the validate program to a snapshot and add it to the envelope:
 
 ``` shell
-toit.compile -w validate.snapshot validate.toit
-firmware -e firmware-esp32 container install validate validate.snapshot
+toit compile --snapshot -o validate.snapshot validate.toit
+toit tool firmware -e firmware-esp32 container install validate validate.snapshot
 ```
 
 Optionally, add other containers to the envelope.
 
 Run the `firmware` tool again to extract a binary image from the envelope:
 
 ``` shell
-firmware -e firmware-esp32 extract --format=binary -o ota.bin
+toit tool firmware -e firmware-esp32 extract --format=binary -o ota.bin
 ```
 
 ### Makefile
@@ -131,9 +131,8 @@ The paths are set up for a Linux system with the Toit SDK installed in
 
 ``` makefile
 TOIT_SDK := /opt/toit-sdk
-TOIT_COMPILE := $(TOIT_SDK)/bin/toit.compile
-TOIT_FIRMWARE := $(TOIT_SDK)/tools/firmware
-VERSION := $(shell $(TOIT_SDK)/bin/toit.lsp version)
+TOIT := $(TOIT_SDK)/bin/toit
+VERSION := $(shell $(TOIT) version)
 ENVELOPE_URL := https://github.com/toitlang/toit/releases/download/$(VERSION)/firmware-esp32.gz
 
 .PHONY: all
@@ -148,11 +147,11 @@ firmware.envelope.gz:
 	curl -L -o $@ $(ENVELOPE_URL)
 
 %.snapshot: %.toit
-	$(TOIT_COMPILE) -w $@ $<
+	$(TOIT) compile --snapshot -o $@ $<
 
 ota.bin: validate.snapshot firmware.envelope
-	$(TOIT_FIRMWARE) -e firmware.envelope container install validate validate.snapshot
-	$(TOIT_FIRMWARE) -e firmware.envelope extract --format=binary -o ota.bin
+	$(TOIT) tool firmware -e firmware.envelope container install validate validate.snapshot
+	$(TOIT) tool firmware -e firmware.envelope extract --format=binary -o ota.bin
 
 .PHONY: serve
 serve: ota.bin

tools/run_all.sh

@@ -20,6 +20,6 @@ do
        $name != "../docs/language/imports.mdx" ]
   then
     echo $name
-    "$TOIT_SDK/bin/toit.run" run_snippets.toit $name
+    "$TOIT_SDK/bin/toit" run run_snippets.toit -- $name
   fi
 done

tools/run_snippets.toit

@@ -143,9 +143,7 @@ class State:
     toit-sdk := os.env.get "TOIT_SDK"
     if not toit-sdk:
       throw "TOIT_SDK environment variable not set"
-    toitc := "$toit-sdk/bin/toit.compile"
-    toitvm := "$toit-sdk/bin/toit.run"
-    kebabify := "$toit-sdk/tools/kebabify"
+    toit := "$toit-sdk/bin/toit"
     filename := snippet-filename ? snippet-filename : DEFAULT-OUTPUT
     snippet-filename = null
     snippet := file.Stream.for-write filename
@@ -170,11 +168,11 @@ class State:
     snippet.close
     result := ?
     if check-only:
-      result = pipe.system "$toitc --analyze $werror-flag $filename"
+      result = pipe.system "$toit analyze $werror-flag $filename"
     else:
-      result = pipe.system "$toitvm $werror-flag $filename"
+      result = pipe.system "$toit run $werror-flag -- $filename"
     before-kebabify := file.read-content filename
-    pipe.system "$kebabify code $filename --toitc $toitc"
+    pipe.system "$toit tool kebabify code $filename"
     after-kebabify := file.read-content filename
     if before-kebabify != after-kebabify:
       throw "Kebabify changed the file $filename"

tutorial_code/ota/Makefile

@@ -3,9 +3,8 @@
 # be found in the LICENSE_BSD0 file.
 
 TOIT_SDK := /opt/toit-sdk
-TOIT_COMPILE := $(TOIT_SDK)/bin/toit.compile
-TOIT_FIRMWARE := $(TOIT_SDK)/tools/firmware
-VERSION := $(shell $(TOIT_SDK)/bin/toit.lsp version)
+TOIT := $(TOIT_SDK)/bin/toit
+VERSION := $(shell $(TOIT) version)
 ENVELOPE_URL := https://github.com/toitlang/toit/releases/download/$(VERSION)/firmware-esp32.gz
 WIFI_CREDENTIALS := {"wifi.ssid":"<my-ssid>","wifi.password":"<my-password>"}
 
@@ -21,12 +20,12 @@ firmware.envelope.gz:
 	curl -L -o $@ $(ENVELOPE_URL)
 
 %.snapshot: %.toit
-	$(TOIT_COMPILE) -w $@ $<
+	$(TOIT) compile --snapshot -o $@ $<
 
 ota.bin: validate.snapshot firmware.envelope
-	$(TOIT_FIRMWARE) -e firmware.envelope container install validate validate.snapshot
-	$(TOIT_FIRMWARE) -e firmware.envelope property set wifi '$(WIFI_CREDENTIALS)'
-	$(TOIT_FIRMWARE) -e firmware.envelope extract --format=binary -o ota.bin
+	$(TOIT) tool firmware -e firmware.envelope container install validate validate.snapshot
+	$(TOIT) tool firmware -e firmware.envelope property set wifi '$(WIFI_CREDENTIALS)'
+	$(TOIT) tool firmware -e firmware.envelope extract --format=binary -o ota.bin
 
 .PHONY: serve
 serve: ota.bin