Merge pull request #145 from coelner/elf2tab

Elf2tab internally install
This commit is contained in:
Jean-Michel Picod
2020-09-24 13:34:57 +02:00
committed by GitHub
3 changed files with 7 additions and 5 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
bin/
target/
Cargo.lock

View File

@@ -404,7 +404,8 @@ class OpenSKInstaller:
assert self.args.application
info("Generating Tock TAB file for application/example {}".format(
self.args.application))
elf2tab_ver = self.checked_command_output(["elf2tab", "--version"]).split(
elf2tab_ver = self.checked_command_output(["bin/elf2tab",
"--version"]).split(
"\n", maxsplit=1)[0]
if elf2tab_ver != "elf2tab 0.6.0":
error(
@@ -414,8 +415,8 @@ class OpenSKInstaller:
tab_filename = os.path.join(self.tab_folder,
"{}.tab".format(self.args.application))
elf2tab_args = [
"elf2tab", "--deterministic", "--package-name", self.args.application,
"-o", tab_filename
"bin/elf2tab", "--deterministic", "--package-name",
self.args.application, "-o", tab_filename
]
if self.args.verbose_build:
elf2tab_args.append("--verbose")

View File

@@ -42,4 +42,4 @@ pip3 install --user --upgrade 'tockloader==1.5' six intelhex
rustup target add thumbv7em-none-eabi
# Install dependency to create applications.
cargo install elf2tab --version 0.6.0
cargo install elf2tab --version 0.6.0 --root .