Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lestarch: fixing incorrectly named setting #94

Merged
merged 3 commits into from
Jul 21, 2022
Merged

lestarch: fixing incorrectly named setting #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbdeb36
lestarch: fixing incorrectly named setting
LeStarch Jul 20, 2022
9bd8fbc
lestarch: fixing errored settings
LeStarch Jul 20, 2022
c89a038
lestarch: formatting
LeStarch Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/fprime/fbuild/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ def get_cmake_args(self) -> dict:
("FPRIME_SETTINGS_FILE", "settings_file"),
("FPRIME_ENVIRONMENT_FILE", "environment_file"),
("FPRIME_AC_CONSTANTS_FILE", "ac_constants"),
("FPRIME_CONFIG_DIR", "config_dir"),
("FPRIME_INSTALL_DEST", "install_dest"),
("FPRIME_CONFIG_DIR", "config_directory"),
("FPRIME_INSTALL_DEST", "install_destination"),
]
cmake_args = {
cache: self.get_settings(setting, None)
Expand Down Expand Up @@ -402,13 +402,17 @@ def purge(self):

def purge_install(self):
"""Purge the install directory"""
assert "install_dest" in self.settings, "install_dest not present in settings"
self.cmake.purge(self.settings["install_dest"])
assert (
"install_destination" in self.settings
), "install_destination not present in settings"
self.cmake.purge(self.settings["install_destination"])

def install_dest_exists(self) -> Path:
"""Check if the install destination exists and returns the path if it does"""
assert "install_dest" in self.settings, "install_dest not present in settings"
path = Path(self.settings["install_dest"])
assert (
"install_destination" in self.settings
), "install_destination not present in settings"
path = Path(self.settings["install_destination"])
return path if path.exists() else None

@staticmethod
Expand Down
16 changes: 11 additions & 5 deletions src/fprime/fbuild/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,18 @@ class IniSettings:
]

PLATFORM_FIELDS = [
("config_dir", SettingType.PATH, partial(join, "framework_path", "config")),
(
"config_directory",
SettingType.PATH,
partial(join, "framework_path", "config"),
),
(
"ac_constants",
SettingType.PATH,
partial(join, "config_dir", "AcConstants.ini"),
partial(join, "config_directory", "AcConstants.ini"),
),
(
"install_dest",
"install_destination",
SettingType.PATH,
partial(join, "_deployment", "build-artifacts"),
),
Expand All @@ -89,8 +93,10 @@ def read_safe_path(
separated by ':'. This will also expand relative paths relative to the settings file.

:param parser: parser to read from
:param section: section to read from
:param key: key to read from
:param ini_file: ini_file path for clean errors
:param exists: expect the path to exist. Default: True, must exist.
:return: path, validated
"""
base_dir = os.path.dirname(ini_file)
Expand Down Expand Up @@ -129,7 +135,7 @@ def read_setting(
section,
key,
settings["settings_file"],
key != "install_dest",
key != "install_destination",
)
value = paths_list[0] if paths_list else get_default_value()
elif settings_type == SettingType.PATH_LIST:
Expand All @@ -138,7 +144,7 @@ def read_setting(
section,
key,
settings["settings_file"],
key != "install_dest",
key != "install_destination",
)
value = paths_list or get_default_value()
else:
Expand Down
2 changes: 1 addition & 1 deletion test/fprime/fbuild/settings-data/settings-custom-install.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[fprime]
install_dest: ../test
install_destination: ../test
framework_path: ../..
16 changes: 8 additions & 8 deletions test/fprime/fbuild/test_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ def test_settings():
"default_toolchain": "native",
"default_ut_toolchain": "native",
"framework_path": full_path(".."),
"install_dest": full_path("settings-data/build-artifacts"),
"install_destination": full_path("settings-data/build-artifacts"),
"library_locations": [],
"environment_file": full_path("settings-data/settings-empty.ini"),
"environment": {},
"component_cookiecutter": "default",
"ac_constants": full_path("..") / "config" / "AcConstants.ini",
"project_root": full_path(".."),
"config_dir": full_path("..") / "config",
"config_directory": full_path("..") / "config",
},
},
{
Expand All @@ -48,7 +48,7 @@ def test_settings():
"default_toolchain": "native",
"default_ut_toolchain": "native",
"framework_path": full_path(".."),
"install_dest": full_path("test"),
"install_destination": full_path("test"),
"library_locations": [],
"environment_file": full_path(
"settings-data/settings-custom-install.ini"
Expand All @@ -57,7 +57,7 @@ def test_settings():
"component_cookiecutter": "default",
"ac_constants": full_path("..") / "config" / "AcConstants.ini",
"project_root": full_path(".."),
"config_dir": full_path("..") / "config",
"config_directory": full_path("..") / "config",
},
},
{
Expand All @@ -69,7 +69,7 @@ def test_settings():
"default_toolchain": "custom1",
"default_ut_toolchain": "custom2",
"framework_path": full_path(".."),
"install_dest": full_path("settings-data/build-artifacts"),
"install_destination": full_path("settings-data/build-artifacts"),
"library_locations": [],
"environment_file": full_path(
"settings-data/settings-custom-toolchain.ini"
Expand All @@ -78,7 +78,7 @@ def test_settings():
"component_cookiecutter": "default",
"ac_constants": full_path("..") / "config" / "AcConstants.ini",
"project_root": full_path(".."),
"config_dir": full_path("..") / "config",
"config_directory": full_path("..") / "config",
},
},
{
Expand All @@ -90,7 +90,7 @@ def test_settings():
"default_toolchain": "native",
"default_ut_toolchain": "native",
"framework_path": full_path(".."),
"install_dest": full_path("settings-data/build-artifacts"),
"install_destination": full_path("settings-data/build-artifacts"),
"library_locations": [],
"environment_file": full_path(
"settings-data/settings-outside-cookiecutter.ini"
Expand All @@ -99,7 +99,7 @@ def test_settings():
"component_cookiecutter": "gh:SterlingPeet/cookiecutter-fprime-deployment",
"ac_constants": full_path("..") / "config" / "AcConstants.ini",
"project_root": full_path(".."),
"config_dir": full_path("..") / "config",
"config_directory": full_path("..") / "config",
},
},
]
Expand Down