From 3f4700194ee248913bc92c4660a3ea3cccabb028 Mon Sep 17 00:00:00 2001 From: thomas-bc Date: Mon, 22 Jan 2024 16:09:13 -0800 Subject: [PATCH] Drop AcConstants.ini support --- src/fprime/fbuild/builder.py | 1 - src/fprime/fbuild/settings.py | 5 ----- test/fprime/fbuild/test_settings.py | 5 ----- 3 files changed, 11 deletions(-) diff --git a/src/fprime/fbuild/builder.py b/src/fprime/fbuild/builder.py index 732e98fa..7ca93987 100644 --- a/src/fprime/fbuild/builder.py +++ b/src/fprime/fbuild/builder.py @@ -301,7 +301,6 @@ def get_cmake_args(self) -> dict: ("FPRIME_PROJECT_ROOT", "project_root"), ("FPRIME_SETTINGS_FILE", "settings_file"), ("FPRIME_ENVIRONMENT_FILE", "environment_file"), - ("FPRIME_AC_CONSTANTS_FILE", "ac_constants"), ("FPRIME_CONFIG_DIR", "config_directory"), ("FPRIME_INSTALL_DEST", "install_destination"), ] diff --git a/src/fprime/fbuild/settings.py b/src/fprime/fbuild/settings.py index 5c23d526..5de25d96 100644 --- a/src/fprime/fbuild/settings.py +++ b/src/fprime/fbuild/settings.py @@ -64,11 +64,6 @@ class IniSettings: SettingType.PATH, partial(join, "framework_path", "config"), ), - ( - "ac_constants", - SettingType.PATH, - partial(join, "config_directory", "AcConstants.ini"), - ), ( "install_destination", SettingType.PATH, diff --git a/test/fprime/fbuild/test_settings.py b/test/fprime/fbuild/test_settings.py index be3aee81..8de2bef0 100644 --- a/test/fprime/fbuild/test_settings.py +++ b/test/fprime/fbuild/test_settings.py @@ -35,7 +35,6 @@ def test_settings(): "environment": {}, "component_cookiecutter": "default", "deployment_cookiecutter": "default", - "ac_constants": full_path("..") / "config" / "AcConstants.ini", "project_root": full_path(".."), "config_directory": full_path("..") / "config", "default_cmake_options": "", @@ -56,7 +55,6 @@ def test_settings(): "environment": {}, "component_cookiecutter": "default", "deployment_cookiecutter": "default", - "ac_constants": full_path("..") / "config" / "AcConstants.ini", "project_root": full_path(".."), "config_directory": full_path("..") / "config", "default_cmake_options": "", @@ -79,7 +77,6 @@ def test_settings(): "environment": {}, "component_cookiecutter": "default", "deployment_cookiecutter": "default", - "ac_constants": full_path("..") / "config" / "AcConstants.ini", "project_root": full_path(".."), "config_directory": full_path("..") / "config", "default_cmake_options": "", @@ -102,7 +99,6 @@ def test_settings(): "environment": {}, "component_cookiecutter": "gh:SterlingPeet/cookiecutter-fprime-deployment", "deployment_cookiecutter": "https://github.com/thomas-bc/fprime-deployment-cookiecutter.git", - "ac_constants": full_path("..") / "config" / "AcConstants.ini", "project_root": full_path(".."), "config_directory": full_path("..") / "config", "default_cmake_options": "", @@ -125,7 +121,6 @@ def test_settings(): "environment": {}, "component_cookiecutter": "default", "deployment_cookiecutter": "default", - "ac_constants": full_path("..") / "config" / "AcConstants.ini", "project_root": full_path(".."), "config_directory": full_path("..") / "config", "default_cmake_options": "OPTION1=ABC\nOPTION2=123\nOPTION3=Something",