opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in BjoernGruening/galaxy-central-bgruening/action_tpye_make_install (pull request #217)

Browse Source
This commit is contained in:
Dave Bouvier
2013-10-15 11:30:55 -04:00
parent 9cb9c06ff7 20d2c28ee6
commit b00a3f9046
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
+8
View File
@@ -486,6 +486,14 @@ def install_and_build_package( app, tool_dependency, actions_dict ):
return_code = handle_command( app, tool_dependency, install_dir, cmd )
if return_code:
return
elif action_type == 'make_install':
# make; make install; allow providing make options
with settings( warn_only=True ):
make_opts = action_dict.get( 'make_opts', '' )
cmd = install_environment.build_command( 'make %s && make install' % make_opts )
return_code = handle_command( app, tool_dependency, install_dir, cmd )
if return_code:
return
elif action_type == 'download_file':
# Download a single file to the current working directory.
url = action_dict[ 'url' ]
lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
+5
View File
@@ -626,6 +626,11 @@ def install_via_fabric( app, tool_dependency, install_dir, package_name=None, pr
action_dict[ 'r_packages' ] = r_packages
else:
continue
elif action_type == 'make_install':
# make; make install; allow providing make options
if action_elem.text:
make_opts = td_common_util.evaluate_template( action_elem.text, install_dir )
action_dict[ 'make_opts' ] = make_opts
elif action_type == 'chmod':
# Change the read, write, and execute bits on a file.
# <action type="chmod">