From 5fee8ae4417ad1362f068b279a34ac2e88ab5ccf Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Fri, 17 Apr 2015 08:43:15 +0000
Subject: [PATCH] 100 j) the build_dir key now must specify a build
directory.diff
---
tools/oneclick/base/hdl_config.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/oneclick/base/hdl_config.py b/tools/oneclick/base/hdl_config.py
index 019365dc05..9e8351c6da 100644
--- a/tools/oneclick/base/hdl_config.py
+++ b/tools/oneclick/base/hdl_config.py
@@ -198,12 +198,11 @@ class HdlConfig:
build_subdir = self.tool.get_key_values(tool_name_key)
build_dirs = []
for lib_dict in cm.listify(lib_dicts):
+ lib_name = lib_dict['hdl_lib_name']
build_dir = os.path.expandvars(self.libs.get_key_values(build_dir_key, lib_dict))
if build_dir=='':
- lib_path = self.libs.get_filePath(lib_dict)
- build_dirs.append(os.path.join(lib_path, build_subdir)) # local build directory in HDL library directory
+ sys.exit('Error : The build_dir key in %s must specify a build directory (default to local build directory within the HDL library directory is not supported)' % lib_name)
else:
- lib_name = lib_dict['hdl_lib_name']
build_dirs.append(os.path.join(build_dir, build_subdir, lib_name)) # central build cdirectory
return cm.unlistify(build_dirs)
--
GitLab