4 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/167437d3da2d/ Changeset: 167437d3da2d Branch: action_tpye_make_install User: BjoernGruening Date: 2013-09-16 12:12:10 Summary: Add <make_install> tag. make && make install in one tag. Affected #: 2 files diff -r 5b17d89780b381bfd53712f964e0b53137adc322 -r 167437d3da2d72f5a553ca0fc4a2259897a2560a lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -409,6 +409,14 @@ 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' ] diff -r 5b17d89780b381bfd53712f964e0b53137adc322 -r 167437d3da2d72f5a553ca0fc4a2259897a2560a lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -602,6 +602,11 @@ # lxml==2.3.0</action> ## Manually specify contents of requirements.txt file to create dynamically. action_dict[ 'requirements' ] = td_common_util.evaluate_template( action_elem.text or 'requirements.txt', install_dir ) + 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"> https://bitbucket.org/galaxy/galaxy-central/commits/be307f53645c/ Changeset: be307f53645c Branch: action_tpye_make_install User: BjoernGruening Date: 2013-09-16 14:46:42 Summary: merge Affected #: 1 file diff -r 167437d3da2d72f5a553ca0fc4a2259897a2560a -r be307f53645c0125826bcd444d9f44b4fde35022 lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -393,7 +393,7 @@ return elif action_type == 'shell_command': with settings( warn_only=True ): - install_environment.add_env_shell_file_paths( action_dict[ 'env_shell_file_paths' ] ) + cmd = install_environment.build_command( action_dict[ 'command' ] ) return_code = handle_command( app, tool_dependency, install_dir, cmd ) if return_code: return https://bitbucket.org/galaxy/galaxy-central/commits/1f9ecea92261/ Changeset: 1f9ecea92261 User: Dave Bouvier Date: 2013-10-15 17:30:55 Summary: Merged in BjoernGruening/galaxy-central-bgruening/action_tpye_make_install (pull request #217) Affected #: 2 files diff -r 8de5aa8e59eff9acfccbdd961d4a8c6a3ff64e40 -r 1f9ecea922615ec3c231aa196a8b1785e7b148a4 lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -486,6 +486,14 @@ 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' ] diff -r 8de5aa8e59eff9acfccbdd961d4a8c6a3ff64e40 -r 1f9ecea922615ec3c231aa196a8b1785e7b148a4 lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -626,6 +626,11 @@ 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"> https://bitbucket.org/galaxy/galaxy-central/commits/914cec313725/ Changeset: 914cec313725 Branch: action_tpye_make_install User: Dave Bouvier Date: 2013-10-15 17:32:42 Summary: Close branch action_tpye_make_install. Affected #: 0 files Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.