Skip to content

Commit 8426865

Browse files
alankingtrel
authored andcommitted
[irods/irods#6020] Add --build_directory to build hook
The user of the build hook now has more control over where build artifacts are placed. If no build directory is provided through the option, the historic, temporary directory behavior is used.
1 parent 99df7d1 commit 8426865

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

irods_consortium_continuous_integration_build_hook.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,25 @@ def copy_output_packages(build_directory, output_root_directory):
6060
irods_python_ci_utilities.append_os_specific_directory(output_root_directory),
6161
lambda s:s.endswith(irods_python_ci_utilities.get_package_suffix()))
6262

63-
def main(output_root_directory, irods_packages_root_directory, externals_directory):
63+
def main(build_directory, output_root_directory, irods_packages_root_directory, externals_directory):
6464
install_building_dependencies(externals_directory)
6565
if irods_packages_root_directory:
6666
irods_python_ci_utilities.install_irods_dev_and_runtime_packages(irods_packages_root_directory)
67-
build_directory = tempfile.mkdtemp(prefix='irods_python_rule_engine_plugin_build_directory')
67+
build_directory = os.path.abspath(build_directory or tempfile.mkdtemp(prefix='irods_python_rule_engine_plugin_build_directory'))
6868
irods_python_ci_utilities.subprocess_get_output(['cmake', os.path.dirname(os.path.realpath(__file__))], check_rc=True, cwd=build_directory)
6969
irods_python_ci_utilities.subprocess_get_output(['make', '-j', str(multiprocessing.cpu_count()), 'package'], check_rc=True, cwd=build_directory)
7070
if output_root_directory:
7171
copy_output_packages(build_directory, output_root_directory)
7272

7373
if __name__ == '__main__':
7474
parser = optparse.OptionParser()
75+
parser.add_option('--build_directory')
7576
parser.add_option('--output_root_directory')
7677
parser.add_option('--irods_packages_root_directory')
7778
parser.add_option('--externals_packages_directory')
7879
options, _ = parser.parse_args()
7980

80-
main(options.output_root_directory, options.irods_packages_root_directory, options.externals_packages_directory)
81+
main(options.build_directory,
82+
options.output_root_directory,
83+
options.irods_packages_root_directory,
84+
options.externals_packages_directory)

0 commit comments

Comments
 (0)