Set only one env variable for the Toit repository. #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the `JAG_TOIT_REPO_PATH` is set, we - Find and build the SDK in it. - Use the IDF from that Toit repository. - Assume that we are in development mode, and thus find the jaguar.snapshot relative to the jag executable. Also, the Makefile was modified, to only use `?=` for variables that we want to influence with environment variables.
kasperl
approved these changes
Apr 27, 2022
cmd/jag/directory/directory.go
Outdated
| @@ -106,9 +118,9 @@ func GetESP32ImageCachePath() (string, error) { | |||
| } | |||
|
|
|||
| func GetESP32ImagePath() (string, error) { | |||
| imagePath, ok := os.LookupEnv(Esp32ImageEnv) | |||
| toit_repo_path, ok := os.LookupEnv(ToitRepoPathEnv) | |||
cmd/jag/directory/directory.go
Outdated
| @@ -89,6 +86,21 @@ func GetSnapshotsCachePath() (string, error) { | |||
| return ensureDirectory(filepath.Join(home, ".cache", "jaguar", "snapshots"), nil) | |||
| } | |||
|
|
|||
| func GetSDKPath() (string, error) { | |||
| toit_repo_path, ok := os.LookupEnv(ToitRepoPathEnv) | |||
cmd/jag/directory/directory.go
Outdated
| @@ -122,6 +134,18 @@ func GetESP32ImagePath() (string, error) { | |||
| } | |||
|
|
|||
| func GetJaguarSnapshotPath() (string, error) { | |||
| _, ok := os.LookupEnv(ToitRepoPathEnv) | |||
| if ok { | |||
| // We assume that the jaguar executable is inside the build directory | |||
There was a problem hiding this comment.
Terminate comment with .
jaguar -> jag
cmd/jag/directory/directory.go
Outdated
| _, ok := os.LookupEnv(ToitRepoPathEnv) | ||
| if ok { | ||
| // We assume that the jaguar executable is inside the build directory | ||
| // of the Jag repository. |
cmd/jag/directory/directory.go
Outdated
| @@ -143,9 +167,9 @@ func GetEsptoolCachePath() (string, error) { | |||
| } | |||
|
|
|||
| func GetEsptoolPath() (string, error) { | |||
| esptoolPath, ok := os.LookupEnv(EsptoolPathEnv) | |||
| toit_repo_path, ok := os.LookupEnv(ToitRepoPathEnv) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the
JAG_TOIT_REPO_PATHis set, wethe jaguar.snapshot relative to the jag executable.
Also, the Makefile was modified, to only use
?=for variables that wewant to influence with environment variables.