Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reapply "Use 'toit' executable instead of the tools. (#538)" (#545) #547

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Reapply "Use 'toit' executable instead of the tools. (#538)" (#545) #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ $(BUILD_DIR)/$(JAG_BINARY): $(JAG_GO_SOURCES)
assets: $(BUILD_DIR)/assets/jaguar.snapshot

$(BUILD_DIR)/assets/jaguar.snapshot: install-dependencies
$(BUILD_DIR)/assets/jaguar.snapshot: $(SDK_PATH)/bin/toit.compile$(EXE_SUFFIX)
$(BUILD_DIR)/assets/jaguar.snapshot: $(SDK_PATH)/bin/toit$(EXE_SUFFIX)
$(BUILD_DIR)/assets/jaguar.snapshot: $(JAG_TOIT_SOURCES)
mkdir -p $(BUILD_DIR)/assets
$(SDK_PATH)/bin/toit.compile$(EXE_SUFFIX) -O2 -w $@ $(JAG_ENTRY_POINT)
$(SDK_PATH)/bin/toit$(EXE_SUFFIX) compile -O2 --snapshot -o $@ $(JAG_ENTRY_POINT)

.PHONY: install-dependencies
install-dependencies: $(SDK_PATH)/bin/toit.pkg$(EXE_SUFFIX)
$(SDK_PATH)/bin/toit.pkg$(EXE_SUFFIX) --project-root=$(CURDIR) install
install-dependencies: $(SDK_PATH)/bin/toit$(EXE_SUFFIX)
$(SDK_PATH)/bin/toit$(EXE_SUFFIX) pkg --project-root=$(CURDIR) install

############################################
# Rules to build with JAG_TOIT_REPO_PATH set
Expand All @@ -71,8 +71,7 @@ install-dependencies: $(SDK_PATH)/bin/toit.pkg$(EXE_SUFFIX)
ifdef JAG_TOIT_REPO_PATH
all: $(JAG_TOIT_REPO_PATH)/build/esp32/firmware.envelope

JAG_TOIT_DEPENDENCIES = $(SDK_PATH)/bin/toit.compile$(EXE_SUFFIX)
JAG_TOIT_DEPENDENCIES += $(SDK_PATH)/bin/toit.pkg$(EXE_SUFFIX)
JAG_TOIT_DEPENDENCIES = $(SDK_PATH)/bin/toit$(EXE_SUFFIX)
JAG_TOIT_DEPENDENCIES += $(JAG_TOIT_REPO_PATH)/build/esp32/firmware.envelope

# We use a marker in the build directory to avoid
Expand Down
4 changes: 2 additions & 2 deletions cmd/jag/commands/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ func jagDecode(ctx context.Context, base64Message string, forcePretty bool, forc
plain = "--force-plain"
}

var decodeCommand *exec.Cmd = sdk.SystemMessage(ctx, "--message", base64Message, pretty, plain)
var decodeCommand *exec.Cmd = sdk.SystemMessage(ctx, base64Message, pretty, plain)
isMissingSnapshot := false
if programId != uuid.Nil {
if _, err := os.Stat(snapshot); errors.Is(err, os.ErrNotExist) {
isMissingSnapshot = true
} else {
decodeCommand = sdk.SystemMessage(ctx, "--snapshot", snapshot, "--message", base64Message, pretty, plain)
decodeCommand = sdk.SystemMessage(ctx, "--snapshot", snapshot, base64Message, pretty, plain)
}
} else {

Expand Down
2 changes: 1 addition & 1 deletion cmd/jag/commands/toit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func ToitLspCmd() *cobra.Command {
}

cmd.SilenceErrors = true
toitLsp := sdk.ToitLsp(ctx, append([]string{"--toitc", sdk.ToitCompilePath()}, args...))
toitLsp := sdk.ToitLsp(ctx, args)
toitLsp.Stdin = os.Stdin
toitLsp.Stdout = os.Stdout
toitLsp.Stderr = os.Stderr
Expand Down
60 changes: 13 additions & 47 deletions cmd/jag/commands/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,8 @@ func GetProgramAssetsPath(flags *pflag.FlagSet, flagName string) (string, error)
return assetsPath, nil
}

func (s *SDK) ToitCompilePath() string {
return filepath.Join(s.Path, "bin", directory.Executable("toit.compile"))
}

func (s *SDK) ToitRunPath() string {
return filepath.Join(s.Path, "bin", directory.Executable("toit.run"))
}

func (s *SDK) ToitLspPath() string {
return filepath.Join(s.Path, "bin", directory.Executable("toit.lsp"))
func (s *SDK) ToitPath() string {
return filepath.Join(s.Path, "bin", directory.Executable("toit"))
}

func (s *SDK) VersionPath() string {
Expand All @@ -106,25 +98,6 @@ func (s *SDK) DownloaderInfoPath() string {
return filepath.Join(s.Path, "JAGUAR")
}

func (s *SDK) SystemMessagePath() string {
return filepath.Join(s.Path, "tools", directory.Executable("system_message"))
}

func (s *SDK) SnapshotToImagePath() string {
return filepath.Join(s.Path, "tools", directory.Executable("snapshot_to_image"))
}

func (s *SDK) AssetsToolPath() string {
return filepath.Join(s.Path, "tools", directory.Executable("assets"))
}

func (s *SDK) FirmwareToolPath() string {
return filepath.Join(s.Path, "tools", directory.Executable("firmware"))
}
func (s *SDK) StacktracePath() string {
return filepath.Join(s.Path, "tools", directory.Executable("stacktrace"))
}

func (s *SDK) validate(info Info, skipSdkVersionCheck bool) error {
if !skipSdkVersionCheck {
if s.Version == "" {
Expand All @@ -150,15 +123,8 @@ func (s *SDK) validate(info Info, skipSdkVersionCheck bool) error {
}

paths := []string{
s.ToitCompilePath(),
s.ToitRunPath(),
s.ToitLspPath(),
s.ToitPath(),
s.VersionPath(),
s.AssetsToolPath(),
s.FirmwareToolPath(),
s.SystemMessagePath(),
s.SnapshotToImagePath(),
s.StacktracePath(),
}
for _, p := range paths {
if err := checkFilepath(p, "invalid Toit SDK"); err != nil {
Expand All @@ -182,43 +148,43 @@ func checkFilepath(p string, invalidMsg string) error {
}

func (s *SDK) ToitCompile(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.ToitCompilePath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"compile"}, args...)...)
}

func (s *SDK) ToitRun(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.ToitRunPath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"run", "--"}, args...)...)
}

func (s *SDK) ToitLsp(ctx context.Context, args []string) *exec.Cmd {
return exec.CommandContext(ctx, s.ToitLspPath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"tool", "lsp"}, args...)...)
}

func (s *SDK) AssetsTool(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.AssetsToolPath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"tool", "assets"}, args...)...)
}

func (s *SDK) FirmwareTool(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.FirmwareToolPath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"tool", "firmware"}, args...)...)
}

func (s *SDK) SnapshotToImage(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.SnapshotToImagePath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"tool", "snapshot-to-image"}, args...)...)
}

func (s *SDK) SystemMessage(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.SystemMessagePath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"decode"}, args...)...)
}

func (s *SDK) Stacktrace(ctx context.Context, args ...string) *exec.Cmd {
return exec.CommandContext(ctx, s.StacktracePath(), args...)
return exec.CommandContext(ctx, s.ToitPath(), append([]string{"tool", "esp", "stacktrace"}, args...)...)
}

func (s *SDK) Compile(ctx context.Context, snapshot string, entrypoint string, optimizationLevel int) error {
var buildSnap *exec.Cmd
if optimizationLevel >= 0 {
buildSnap = s.ToitCompile(ctx, "-w", snapshot, "-O"+strconv.Itoa(optimizationLevel), entrypoint)
buildSnap = s.ToitCompile(ctx, "--snapshot", "-o", snapshot, "-O"+strconv.Itoa(optimizationLevel), entrypoint)
} else {
buildSnap = s.ToitCompile(ctx, "-w", snapshot, entrypoint)
buildSnap = s.ToitCompile(ctx, "--snapshot", "-o", snapshot, entrypoint)
}
buildSnap.Stderr = os.Stderr
buildSnap.Stdout = os.Stdout
Expand Down