| Previous changeset 2:f386d7431fe0 (2014-06-24) Next changeset 4:afc48696ee5c (2015-11-04) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_r_3_0_3 commit e10d6e2c4435771dc6f44d940359c1a31c0d6742-dirty |
|
modified:
tool_dependencies.xml |
| b |
| diff -r f386d7431fe0 -r a8438aa1207c tool_dependencies.xml --- a/tool_dependencies.xml Tue Jun 24 15:47:01 2014 -0400 +++ b/tool_dependencies.xml Fri Jul 17 10:52:21 2015 -0400 |
| b |
| b'@@ -1,59 +1,59 @@\n <?xml version="1.0"?>\n <tool_dependency>\n- <package name="R" version="3.0.3">\n- <install version="1.0">\n- <actions_group>\n- <actions architecture="x86_64" os="darwin">\n- <action type="download_by_url">http://depot.galaxyproject.org/package/darwin/x86_64/R/R-3.0.3-Darwin-x86_64.tgz</action>\n+ <package name="R" version="3.0.3">\n+ <install version="1.0">\n+ <actions_group>\n+ <actions architecture="x86_64" os="darwin">\n+ <action type="download_by_url">http://depot.galaxyproject.org/package/darwin/x86_64/R/R-3.0.3-Darwin-x86_64.tgz</action>\n <action type="move_directory_files">\n- <source_directory>.</source_directory>\n+ <source_directory>.</source_directory>\n <destination_directory>$INSTALL_DIR</destination_directory>\n </action>\n <action type="shell_command">sh $INSTALL_DIR/darwin_post_install.sh $INSTALL_DIR</action>\n </actions>\n <actions architecture="x86_64" os="linux">\n- <action type="download_by_url">http://depot.galaxyproject.org/package/linux/x86_64/R/R-3.0.3-Linux-x86_64.tgz</action>\n+ <action type="download_by_url">http://depot.galaxyproject.org/package/linux/x86_64/R/R-3.0.3-Linux-x86_64.tgz</action>\n <action type="move_directory_files">\n- <source_directory>.</source_directory>\n+ <source_directory>.</source_directory>\n <destination_directory>$INSTALL_DIR</destination_directory>\n </action>\n <action type="set_environment">\n- <environment_variable action="set_to" name="TCL_LIBRARY">$INSTALL_DIR/lib/libtcl8.4.so</environment_variable>\n+ <environment_variable action="set_to" name="TCL_LIBRARY">$INSTALL_DIR/lib/libtcl8.4.so</environment_variable>\n <environment_variable action="set_to" name="TK_LIBRARY">$INSTALL_DIR/lib/libtk8.4.so</environment_variable>\n </action>\n </actions>\n <actions>\n- <package name="readline" version="6.2">\n- <repository changeset_revision="052e8df231ac" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />\n+ <package name="readline" version="6.2">\n+ <repository changeset_revision="052e8df231ac" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />\n </package>\n <package name="libpng" version="1.6.7">\n- <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />\n+ <repository changeset_revision="f48b920cae1f" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />\n </package>\n <package name="cairo" version="1.12.14">\n- <repository changeset_revision="b39299b4b6e1" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />\n+ <repository changeset_revision="b39299b4b6e1" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />\n </package>\n <package name="pixman" version="0.32.4">\n- <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="http://'..b'ry changeset_revision="b39299b4b6e1" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu">\n+ <package name="cairo" version="1.12.14" />\n </repository>\n- <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">\n- <package name="pixman" version="0.32.4" />\n+ <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu">\n+ <package name="pixman" version="0.32.4" />\n </repository>\n- <repository changeset_revision="58782940c411" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">\n- <package name="freetype" version="2.5.2" />\n+ <repository changeset_revision="58782940c411" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu">\n+ <package name="freetype" version="2.5.2" />\n </repository>\n </action>\n <action type="shell_command">\n@@ -75,22 +75,23 @@\n --enable-R-shlib \\\n --disable-R-framework \\\n --libdir=$INSTALL_DIR/lib \\\n- --prefix=$INSTALL_DIR \n+ --prefix=$INSTALL_DIR\n </action>\n <action type="make_install" />\n- <action type="shell_command">sed -i.bak \'s;$INSTALL_DIR;\\${R_ROOT_DIR};g\' $INSTALL_DIR/bin/R</action>\n- <action type="shell_command">sed -i.bak \'s;$INSTALL_DIR;\\${R_ROOT_DIR};g\' $INSTALL_DIR/lib/R/bin/R</action>\n+ <action type="shell_command">sed -i.bak -e \'s;$INSTALL_DIR;\\${R_ROOT_DIR};g\' $INSTALL_DIR/bin/R</action>\n+ <action type="shell_command">sed -i.bak -e \'s;$INSTALL_DIR;\\${R_ROOT_DIR};g\' $INSTALL_DIR/lib/R/bin/R</action>\n </actions>\n <action type="set_environment">\n- <environment_variable action="set_to" name="R_DOC_DIR">$INSTALL_DIR/lib/R/doc</environment_variable>\n+ <environment_variable action="set_to" name="R_DOC_DIR">$INSTALL_DIR/lib/R/doc</environment_variable>\n <environment_variable action="set_to" name="R_HOME_DIR">$INSTALL_DIR/lib/R</environment_variable>\n <environment_variable action="set_to" name="R_INCLUDE_DIR">$INSTALL_DIR/lib/R/include</environment_variable>\n <environment_variable action="set_to" name="R_SHARE_DIR">$INSTALL_DIR/lib/R/share</environment_variable>\n <environment_variable action="set_to" name="R_ROOT_DIR">$INSTALL_DIR</environment_variable>\n- <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>\n+ <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR</environment_variable>\n <environment_variable action="set_to" name="RHOME">$INSTALL_DIR/lib/R</environment_variable>\n <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>\n <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>\n+ <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/R/lib</environment_variable>\n </action>\n </actions_group>\n </install>\n' |