From ef40657c272fe8c321cccf7bea5a4fc27becc068 Mon Sep 17 00:00:00 2001
From: coelner <waenger@googlemail.com>
Date: Tue, 18 Aug 2020 17:01:50 +0200
Subject: [PATCH] install a local elf2tab binary within the repo itself

---
 .gitignore | 1 +
 deploy.py  | 9 +++++----
 setup.sh   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 626f9dd..85ef7c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+bin/
 target/
 Cargo.lock
 
diff --git a/deploy.py b/deploy.py
index 2109a20..57c183c 100755
--- a/deploy.py
+++ b/deploy.py
@@ -404,8 +404,9 @@ 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(
-        "\n", maxsplit=1)[0]
+    elf2tab_ver = self.checked_command_output(["bin/elf2tab",
+                                               "--version"]).split(
+                                                   "\n", maxsplit=1)[0]
     if elf2tab_ver != "elf2tab 0.6.0":
       error(
           ("Detected unsupported elf2tab version {!a}. The following "
@@ -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")
diff --git a/setup.sh b/setup.sh
index 4047368..b024784 100755
--- a/setup.sh
+++ b/setup.sh
@@ -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 .