Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Uniform gcc-avr => avr-gcc for consistency

pull/194/head
Yuri D'Elia 2022-07-26 18:44:20 +02:00 committed by DRracer
parent 911b1c5e69
commit 392298c3da
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@ Run `./utils/bootstrap.py`
- clang-format-9.0.0-noext - clang-format-9.0.0-noext
- cmake-3.22.5 - cmake-3.22.5
- ninja-1.10.2 - ninja-1.10.2
- gcc-avr-7.3.0 - avr-gcc-7.3.0
## How to build the preliminary project so far: ## How to build the preliminary project so far:
Now the process is the same as in the Buddy Firmware: Now the process is the same as in the Buddy Firmware:

2
cmake/AvrGcc.cmake
View File

@ -1,6 +1,6 @@
get_filename_component(PROJECT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) get_filename_component(PROJECT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
set(AVR_GCC_VERSION 7.3.0) 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") include("${PROJECT_CMAKE_DIR}/AnyAvrGcc.cmake")

2
cmake/Utilities.cmake
View File

@ -9,7 +9,7 @@ endif()
function(get_recommended_gcc_version var) function(get_recommended_gcc_version var)
execute_process( execute_process(
COMMAND "${Python3_EXECUTABLE}" "${PROJECT_ROOT_DIR}/utils/bootstrap.py" COMMAND "${Python3_EXECUTABLE}" "${PROJECT_ROOT_DIR}/utils/bootstrap.py"
"--print-dependency-version" "gcc-avr" "--print-dependency-version" "avr-gcc"
OUTPUT_VARIABLE RECOMMENDED_VERSION OUTPUT_VARIABLE RECOMMENDED_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE RETVAL RESULT_VARIABLE RETVAL

2
utils/bootstrap.py
View File

@ -43,7 +43,7 @@ dependencies = {
'Darwin': 'https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-macos-universal.tar.gz', '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', 'version': '7.3.0',
'url': { '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', 'Linux': 'https://ww1.microchip.com/downloads/aemDocuments/documents/DEV/ProductDocuments/SoftwareTools/avr8-gnu-toolchain-3.7.0.1796-linux.any.x86_64.tar.gz',

4
utils/build.py
View File

@ -69,7 +69,6 @@ class BuildType(Enum):
class BuildConfiguration(ABC): class BuildConfiguration(ABC):
@abstractmethod @abstractmethod
def get_cmake_cache_entries(self): def get_cmake_cache_entries(self):
"""Convert the build configuration to CMake cache entries.""" """Convert the build configuration to CMake cache entries."""
@ -87,7 +86,6 @@ class BuildConfiguration(ABC):
class FirmwareBuildConfiguration(BuildConfiguration): class FirmwareBuildConfiguration(BuildConfiguration):
def __init__(self, def __init__(self,
build_type: BuildType, build_type: BuildType,
toolchain: Path = None, toolchain: Path = None,
@ -115,7 +113,7 @@ class FirmwareBuildConfiguration(BuildConfiguration):
entries.extend([ entries.extend([
('CMAKE_MAKE_PROGRAM', 'FILEPATH', str(get_dependency('ninja'))), ('CMAKE_MAKE_PROGRAM', 'FILEPATH', str(get_dependency('ninja'))),
('CMAKE_TOOLCHAIN_FILE', 'FILEPATH', str(self.toolchain)), ('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()), ('CMAKE_BUILD_TYPE', 'STRING', self.build_type.value.title()),
('PROJECT_VERSION_SUFFIX', 'STRING', self.version_suffix or ''), ('PROJECT_VERSION_SUFFIX', 'STRING', self.version_suffix or ''),
('PROJECT_VERSION_SUFFIX_SHORT', 'STRING', ('PROJECT_VERSION_SUFFIX_SHORT', 'STRING',