From e4cd9125ec67ccb5979ad4853ee93d816c095ab6 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Tue, 26 Jul 2022 18:44:20 +0200
Subject: [PATCH] Uniform gcc-avr => avr-gcc for consistency

---
 README.md             | 2 +-
 cmake/AvrGcc.cmake    | 2 +-
 cmake/Utilities.cmake | 2 +-
 utils/bootstrap.py    | 2 +-
 utils/build.py        | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d3a1411..952dc67 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Run `./utils/bootstrap.py`
 - clang-format-9.0.0-noext
 - cmake-3.22.5
 - ninja-1.10.2
-- gcc-avr-7.3.0
+- avr-gcc-7.3.0
 
 ## How to build the preliminary project so far:
 Now the process is the same as in the Buddy Firmware:
diff --git a/cmake/AvrGcc.cmake b/cmake/AvrGcc.cmake
index 0c21a92..741e961 100644
--- a/cmake/AvrGcc.cmake
+++ b/cmake/AvrGcc.cmake
@@ -1,6 +1,6 @@
 get_filename_component(PROJECT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 
 set(AVR_GCC_VERSION 7.3.0)
-set(AVR_TOOLCHAIN_DIR "${PROJECT_CMAKE_DIR}/../.dependencies/gcc-avr-${AVR_GCC_VERSION}/")
+set(AVR_TOOLCHAIN_DIR "${PROJECT_CMAKE_DIR}/../.dependencies/avr-gcc-${AVR_GCC_VERSION}/")
 
 include("${PROJECT_CMAKE_DIR}/AnyAvrGcc.cmake")
diff --git a/cmake/Utilities.cmake b/cmake/Utilities.cmake
index 8a43d91..881ae05 100644
--- a/cmake/Utilities.cmake
+++ b/cmake/Utilities.cmake
@@ -9,7 +9,7 @@ endif()
 function(get_recommended_gcc_version var)
   execute_process(
     COMMAND "${Python3_EXECUTABLE}" "${PROJECT_ROOT_DIR}/utils/bootstrap.py"
-            "--print-dependency-version" "gcc-avr"
+            "--print-dependency-version" "avr-gcc"
     OUTPUT_VARIABLE RECOMMENDED_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
     RESULT_VARIABLE RETVAL
diff --git a/utils/bootstrap.py b/utils/bootstrap.py
index abf74fe..9b5e40a 100755
--- a/utils/bootstrap.py
+++ b/utils/bootstrap.py
@@ -43,7 +43,7 @@ dependencies = {
             'Darwin': 'https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-macos-universal.tar.gz',
         },
     },
-    'gcc-avr': {
+    'avr-gcc': {
         'version': '7.3.0',
         'url': {
             'Linux': 'https://ww1.microchip.com/downloads/aemDocuments/documents/DEV/ProductDocuments/SoftwareTools/avr8-gnu-toolchain-3.7.0.1796-linux.any.x86_64.tar.gz',
diff --git a/utils/build.py b/utils/build.py
index 9773e4e..037b169 100755
--- a/utils/build.py
+++ b/utils/build.py
@@ -69,7 +69,6 @@ class BuildType(Enum):
 
 
 class BuildConfiguration(ABC):
-
     @abstractmethod
     def get_cmake_cache_entries(self):
         """Convert the build configuration to CMake cache entries."""
@@ -87,7 +86,6 @@ class BuildConfiguration(ABC):
 
 
 class FirmwareBuildConfiguration(BuildConfiguration):
-
     def __init__(self,
                  build_type: BuildType,
                  toolchain: Path = None,
@@ -115,7 +113,7 @@ class FirmwareBuildConfiguration(BuildConfiguration):
         entries.extend([
             ('CMAKE_MAKE_PROGRAM', 'FILEPATH', str(get_dependency('ninja'))),
             ('CMAKE_TOOLCHAIN_FILE', 'FILEPATH', str(self.toolchain)),
-            ('AVR_TOOLCHAIN_DIR', 'DIRPATH', str(get_dependency('gcc-avr'))),
+            ('AVR_TOOLCHAIN_DIR', 'DIRPATH', str(get_dependency('avr-gcc'))),
             ('CMAKE_BUILD_TYPE', 'STRING', self.build_type.value.title()),
             ('PROJECT_VERSION_SUFFIX', 'STRING', self.version_suffix or ''),
             ('PROJECT_VERSION_SUFFIX_SHORT', 'STRING',