Skip to content

Commit 5e238b4

Browse files
committed
fix: separate out merge-install and install-base
1 parent 40bef09 commit 5e238b4

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

generate_parameter_library_py/generate_parameter_library_py/setup_helper.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434

3535
def generate_parameter_module(
36-
module_name, yaml_file, validation_module='', merge_install_base=None
36+
module_name, yaml_file, validation_module='', install_base=None, merge_install=False
3737
):
3838
# TODO there must be a better way to do this. I need to find the build directory so I can place the python
3939
# module there
@@ -54,10 +54,11 @@ def generate_parameter_module(
5454
tmp = tmp.split('.')
5555
py_version = f'python{tmp[0]}.{tmp[1]}'
5656

57+
if not install_base:
58+
install_base = os.path.join(colcon_ws, 'install')
59+
5760
install_base = (
58-
merge_install_base
59-
if merge_install_base
60-
else os.path.join(colcon_ws, 'install', pkg_name)
61+
install_base if merge_install else os.path.join(install_base, pkg_name)
6162
)
6263
install_dir = os.path.join(
6364
install_base,

0 commit comments

Comments
 (0)