From 1383fde3457168ed759d6ed3b913dfae8a6085ef Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 5 Mar 2020 16:23:07 -0800 Subject: uhd: paths: Harmonize around XDG Base Directory specification Up until now, we completely ignore the XDG specification. This commit does the following to change that: - It uses XDG_DATA_HOME and XDG_CONFIG_HOME for cal and config data, respectively. - If config data is in ~/.uhd/uhd.conf, that is still accepted, but if it conflicts with $XDG_CONFIG_HOME/uhd.conf, it is ignored and a warning is displayed - The default location for cal data is thus ${HOME}/.local/share/uhd/cal on Unix, and %LOCALAPPDATA%\uhd\cal on Windows. This is a change in location! - The UHD_CONFIG_DIR environment variable was confusingly named and is now removed. It provided an alternative location than the home directory. The same purpose is now much better served by XDG_DATA_HOME and XDG_CONFIG_HOME. The specification can be found here: specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html --- host/tests/paths_test.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'host/tests') diff --git a/host/tests/paths_test.cpp b/host/tests/paths_test.cpp index 5115891b0..930b34ec8 100644 --- a/host/tests/paths_test.cpp +++ b/host/tests/paths_test.cpp @@ -41,19 +41,18 @@ BOOST_AUTO_TEST_CASE(test_get_paths) { using namespace uhd; - const std::string tmp_path = get_tmp_path(); - const std::string app_path = get_app_path(); - const std::string pkg_path = get_pkg_path(); - const std::string cal_path = get_cal_data_path(); - const auto module_paths = get_module_paths(); + std::cout << "tmp_path: " << get_tmp_path() << std::endl; + BOOST_CHECK(true); + std::cout << "pkg_path: " << get_pkg_path() << std::endl; + BOOST_CHECK(true); + std::cout << "cal_path: " << get_cal_data_path() << std::endl; + BOOST_CHECK(true); - std::cout << "tmp_path: " << tmp_path << std::endl; - std::cout << "app_path: " << app_path << std::endl; - std::cout << "pkg_path: " << pkg_path << std::endl; - std::cout << "cal_path: " << cal_path << std::endl; + const auto module_paths = get_module_paths(); for (const auto& module_path : module_paths) { std::cout << "module path: " << module_path << std::endl; } + BOOST_CHECK(true); const std::string images_dir_search_path = ""; const std::string images_dir = get_images_dir(images_dir_search_path); -- cgit v1.2.3