Merge pull request #96 from toitlang/prepare-v0.6.0

Prepare to release v0.6.0 based on SDK v0.14.0
toitlang · Jan 7, 2022 · 042b787 · 042b787
2 parents 8402641 + 957945c
commit 042b787
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -46,17 +46,13 @@ jag-macos-sign:
 .PHONY: snapshot
 snapshot: $(BUILD_DIR)/jaguar.snapshot
 
-.PHONY: $(TOIT_REPO_PATH)/build/host/sdk/bin/toit.pkg
-$(TOIT_REPO_PATH)/build/host/sdk/bin/toit.pkg:
-	make -C $(TOIT_REPO_PATH) build/host/sdk/bin/toit.pkg
+.PHONY: $(JAG_TOIT_PATH)/bin/toit.compiler $(JAG_TOIT_PATH)/bin/toit.pkg
+$(JAG_TOIT_PATH)/bin/toit.compiler $(JAG_TOIT_PATH)/bin/toit.pkg:
+	make -C $(TOIT_REPO_PATH) tools
 
 .packages: $(JAG_TOIT_PATH)/bin/toit.pkg $(TOIT_SOURCE)
 	$(JAG_TOIT_PATH)/bin/toit.pkg pkg install
 
-.PHONY: $(TOIT_REPO_PATH)/build/host/sdk/bin/toit.compiler
-$(TOIT_REPO_PATH)/build/host/sdk/bin/toit.compiler:
-	make -C $(TOIT_REPO_PATH) build/host/sdk/bin/toit.compiler
-
 $(BUILD_DIR)/jaguar.snapshot: $(JAG_TOIT_PATH)/bin/toit.compiler $(TOIT_SOURCE) $(BUILD_DIR) .packages
 	$(JAG_TOIT_PATH)/bin/toit.compiler -w ./$@ ./src/jaguar.toit
 

diff --git a/cmd/jag/commands/util.go b/cmd/jag/commands/util.go
@@ -69,7 +69,7 @@ func (s *SDK) ToitRunPath() string {
 }
 
 func (s *SDK) ToitRunSnapshotPath() string {
-	return filepath.Join(s.Path, "bin", directory.Executable("run_boot.snapshot"))
+	return filepath.Join(s.Path, "bin", "toit.run.snapshot")
 }
 
 func (s *SDK) ToitLspPath() string {

diff --git a/cmd/jag/main.go b/cmd/jag/main.go
@@ -12,9 +12,9 @@ import (
 )
 
 var (
-	date       = "2022-01-05T05:22:00Z"
-	version    = "v0.5.1"
-	sdkVersion = "v0.13.1"
+	date       = "2022-01-07T11:37:43Z"
+	version    = "v0.6.0"
+	sdkVersion = "v0.14.0"
 )
 
 func main() {

diff --git a/third_party/toit b/third_party/toit