aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/utils/images.cpp
diff options
context:
space:
mode:
authorBen Hilburn <ben.hilburn@ettus.com>2014-11-03 17:05:26 -0800
committerMartin Braun <martin.braun@ettus.com>2014-11-21 00:16:47 +0100
commitbeabf3d302a98a0a1e28ae8cc4d338f0bd13db6e (patch)
treee2b7ab145ec2daa83c4589e96b0f67bc5a3fd38d /host/lib/utils/images.cpp
parent3407376f8af0fc39f29c1c8ce9020d02a2bf05d9 (diff)
downloaduhd-beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e.tar.gz
uhd-beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e.tar.bz2
uhd-beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e.zip
uhd: replaced the `images_error` with a generic utility error
- Deleted images.*, moved functionality to paths.* - Applies for all devices that check FPGA or FW compat numbers - Adds generic utility search tool
Diffstat (limited to 'host/lib/utils/images.cpp')
-rw-r--r--host/lib/utils/images.cpp54
1 files changed, 0 insertions, 54 deletions
diff --git a/host/lib/utils/images.cpp b/host/lib/utils/images.cpp
deleted file mode 100644
index 1ba2f81e6..000000000
--- a/host/lib/utils/images.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright 2010-2012 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/utils/images.hpp>
-#include <uhd/exception.hpp>
-#include <uhd/utils/paths.hpp>
-#include <boost/foreach.hpp>
-#include <boost/filesystem.hpp>
-#include <vector>
-#include <iostream>
-
-namespace fs = boost::filesystem;
-
-std::vector<fs::path> get_image_paths(void); //defined in paths.cpp
-
-/***********************************************************************
- * Find an image in the image paths
- **********************************************************************/
-std::string uhd::find_image_path(const std::string &image_name){
- if (fs::exists(image_name)){
- return fs::system_complete(image_name).string();
- }
- BOOST_FOREACH(const fs::path &path, get_image_paths()){
- fs::path image_path = path / image_name;
- if (fs::exists(image_path)) return image_path.string();
- }
- throw uhd::io_error("Could not find path for image: " + image_name + "\n\n" + uhd::print_images_error());
-}
-
-std::string uhd::find_images_downloader(void){
- return fs::path(fs::path(uhd::get_pkg_path()) / UHD_LIB_DIR / "uhd" / "utils" / "uhd_images_downloader.py").string();
-}
-
-std::string uhd::print_images_error(void){
- #ifdef UHD_PLATFORM_WIN32
- return "As an Administrator, please run:\n\n\"" + find_images_downloader() + "\"";
- #else
- return "Please run:\n\nsudo \"" + find_images_downloader() + "\"";
- #endif
-}