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

Jump to bottom

Add export file by default #144

Merged
merged 2 commits into from
Sep 22, 2022
Merged

Add export file by default #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8373d5
refactor: ⚡️ Add export file by default
SergioGasquez Sep 12, 2022
88828b9
Merge branch 'build/1.64.0.0' into feature/export-file-default
georgik Sep 22, 2022
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
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ No prerequisites are needed for macOS.
git clone https://github.com/esp-rs/rust-build.git
cd rust-build
./install-rust-toolchain.sh
. export-esp.sh
```

Run `./install-rust-toolchain.sh --help` for more information about arguments.
Expand All @@ -83,16 +84,16 @@ Export variables are displayed at the end of the script.
Installation of different version of the toolchain:

```
./install-rust-toolchain.sh --toolchain-version 1.64.0.0 --export-file export-esp-rust.sh
source export-esp-rust.sh
./install-rust-toolchain.sh --toolchain-version 1.64.0.0
. export-esp.sh
```

#### Arguments
- `-b|--build-target`: Comma separated list of targets [`esp32,esp32s2,esp32s3,esp32c3,all`]. Defaults to: `esp32,esp32s2,esp32s3`
- `-c|--cargo-home`: Cargo path.
- `-d|--toolchain-destination`: Toolchain instalation folder. Defaults to: `<rustup_home>/toolchains/esp`
- `-e|--extra-crates`: Extra crates to install. Defaults to: `ldproxy cargo-espflash`
- `-f|--export-file`: Destination of the export file generated.
- `-f|--export-file`: Destination of the export file generated. Defaults to: `export-esp.sh`
- `-i|--installation-mode`: Installation mode: [`install, reinstall, uninstall`]. Defaults to: `install`
- `-k|--minified-llvm`: Use minified LLVM. Possible values: [`YES, NO`]. Defaults to: `YES`
- `-l|--llvm-version`: LLVM version.
Expand Down
4 changes: 2 additions & 2 deletions install-rust-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ESP_IDF_VERSION=""
MINIFIED_ESP_IDF="NO"
IS_XTENSA_INSTALLED=0
SYSTEM_PACKAGES="openssl@3"
EXPORT_FILE=""
EXPORT_FILE="export-esp.sh"

display_help() {
echo "Usage: install-rust-toolchain.sh <arguments>"
Expand All @@ -34,7 +34,7 @@ display_help() {
echo "-c|--cargo-home Cargo path"
echo "-d|--toolchain-destination Toolchain installation folder."
echo "-e|--extra-crates Extra crates to install. Defaults to: ldproxy cargo-espflash"
echo "-f|--export-file Destination of the export file generated."
echo "-f|--export-file Destination of the export file generated. Defaults to: export-esp.sh"
echo "-i|--installation-mode Installation mode: [install, reinstall, uninstall]. Defaults to: install"
echo "-k|--minified-llvm Use minified LLVM. Possible values [YES, NO]"
echo "-l|--llvm-version LLVM version"
Expand Down