Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 14:23:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build script: Don't use wget or curl, just urlretrieve

Browse Source
This commit is contained in:
Thomas Krijnen
2019-06-30 09:44:40 +02:00
parent c29cc87660
commit 51cf52c388
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+5 -23
View File
@@ -262,20 +262,9 @@ for cmd in [git, bunzip2, tar, cc, cplusplus, autoconf, automake, yacc, make, "p
raise ValueError("Required tool '%s' not installed or not added to PATH" % (cmd,)) raise ValueError("Required tool '%s' not installed or not added to PATH" % (cmd,))
# identifiers for the download tool (could be less memory consuming as ints, but are more verbose as strings) # identifiers for the download tool (could be less memory consuming as ints, but are more verbose as strings)
download_tool_curl="curl" download_tool_default = download_tool_py = "py"
download_tool_wget="wget"
download_tool_git = "git" download_tool_git = "git"
if which(wget) != None:
download_tool_default = download_tool_wget
elif which(curl) != None:
download_tool_default = download_tool_curl
else:
raise ValueError("No download application found, tried: curl, wget")
CURL = ["curl", "-sL"]
WGET= ["wget", "-q", "--no-check-certificate"]
# Create log directory and file # Create log directory and file
log_dir = os.path.join(DEPS_DIR, "logs") log_dir = os.path.join(DEPS_DIR, "logs")
@@ -363,24 +352,17 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
if not os.path.exists(build_dir): if not os.path.exists(build_dir):
os.makedirs(build_dir) os.makedirs(build_dir)
if download_tool == download_tool_curl or download_tool == download_tool_wget: logger.info("\rFetching %s... " % (name,))
if download_tool == download_tool_py:
if no_append_name: if no_append_name:
url = download_url url = download_url
else: else:
url = os.path.join(download_url, download_name) url = os.path.join(download_url, download_name)
if download_tool == download_tool_curl:
download_path = os.path.join(build_dir, download_name) download_path = os.path.join(build_dir, download_name)
if not os.path.exists(download_path): if not os.path.exists(download_path):
logger.info("\rDownloading %s... " % (name,)) urlretrieve(url, os.path.join(build_dir, download_path))
run(CURL + ["-o", download_name, url], cwd=build_dir)
else:
logger.info("Download '%s' already exists, assuming it's an undamaged download and that it has been extracted if possible, skipping" % (download_path,))
elif download_tool == download_tool_wget:
download_path = os.path.join(build_dir, download_name)
if not os.path.exists(download_path):
logger.info("\rDownloading %s... " % (name,))
run(WGET + ["-O", download_name, url], cwd=build_dir)
else: else:
logger.info("Download '%s' already exists, assuming it's an undamaged download and that it has been extracted if possible, skipping" % (download_path,)) logger.info("Download '%s' already exists, assuming it's an undamaged download and that it has been extracted if possible, skipping" % (download_path,))
elif download_tool == download_tool_git: elif download_tool == download_tool_git: