diff options
author | Martin Braun <martin.braun@ettus.com> | 2018-05-17 14:09:47 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-05-17 14:09:47 -0700 |
commit | 174bde6cc17c901b116c99fea8f1888c96f7823b (patch) | |
tree | 5d5df5385ece52acceb9763ae50ebacc57d0d719 /images/populate_images.py | |
parent | 9591c93dd53f95b845ceead39eaaf219dc18659b (diff) | |
download | uhd-174bde6cc17c901b116c99fea8f1888c96f7823b.tar.gz uhd-174bde6cc17c901b116c99fea8f1888c96f7823b.tar.bz2 uhd-174bde6cc17c901b116c99fea8f1888c96f7823b.zip |
images: Update scripts for new release model
- populate_images.py: Made Py3k safe
- uhdimgs.py: Make Py3k-safe
- create_imgs_package.py: Rewrote to build release images packages
- make_zip.sh: Skip CMake, just zip up the files
- Updated README to reflect all the changes
Diffstat (limited to 'images/populate_images.py')
-rwxr-xr-x | images/populate_images.py | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/images/populate_images.py b/images/populate_images.py index 20fcb7028..adf75ec8b 100755 --- a/images/populate_images.py +++ b/images/populate_images.py @@ -1,47 +1,41 @@ #!/usr/bin/env python # # Copyright 2014 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company # -# 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/>. +# SPDX-License-Identifier: GPL-3.0-or-later # """ Populates the current directory with a valid set of binaries for the current commit. """ +from __future__ import print_function import os import subprocess import uhdimgs -def main(): +def download_images(img_root_dir=None): " Go, go, go! " # Switch to correct dir - img_root_dir = os.path.join(uhdimgs.get_images_dir(), 'images') + img_root_dir = img_root_dir or os.path.join(uhdimgs.get_images_dir(), 'images') + if not os.path.isdir(img_root_dir): + print("== Creating images directory...") + os.mkdir(img_root_dir) os.chdir(uhdimgs.get_images_dir()) - print "== Starting download..." + print("== Starting download...") try: downloader_cmd = [ - 'python', - '../host/utils/uhd_images_downloader.py.in', - '-i', img_root_dir, - '-m', 'manifest.txt' + 'python', + '../host/utils/uhd_images_downloader.py.in', + '-i', img_root_dir, + '-m', 'manifest.txt' ] subprocess.check_call(downloader_cmd) except (subprocess.CalledProcessError, OSError): - print "[ERROR] Failed to run downloader script." + print("[ERROR] Failed to run downloader script.") exit(1) - print "== Done!" + print("== Done!") if __name__ == "__main__": - main() + download_images() |