Galaxy |

Changeset 1:6e1b17857732 (2014-03-07)

Previous changeset 0:8d0a55bf7aaf (2013-09-25) Next changeset 2:5824d2b3bc8b (2014-04-02)

Commit message:
Uploaded tool dependency definition that attempts to download a precompiled binary.

modified:
tool_dependencies.xml

diff -r 8d0a55bf7aaf -r 6e1b17857732 tool_dependencies.xml
--- a/tool_dependencies.xml Wed Sep 25 10:28:04 2013 -0400
+++ b/tool_dependencies.xml Fri Mar 07 11:05:23 2014 -0500

b'@@ -2,27 +2,97 @@\n <tool_dependency>\n <package name="R" version="2.11.0">\n <install version="1.0">\n- <actions>\n- <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.11.0.tar.gz</action>\n- <action type="shell_command">\n- ./configure --enable-R-shlib \\\n- --with-readline=no \\\n- --with-x=no \\\n- --prefix=$INSTALL_DIR \\\n- --libdir=$INSTALL_DIR/lib \\\n- --disable-R-framework\n- </action>\n- <action type="shell_command">make && make install</action>\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-2.11.0-Darwin-x86_64.tgz</action>\n+ <action type="move_directory_files">\n+ <source_directory>.</source_directory>\n+ <destination_directory>$INSTALL_DIR</destination_directory>\n+ </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-2.11.0-Linux-x86_64.tgz</action>\n+ <action type="move_directory_files">\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="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="16fc64dad9ca" name="package_readline_6_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />\n+ </package>\n+ <package name="libpng" version="1.6.7">\n+ <repository changeset_revision="7c4a9189b712" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />\n+ </package>\n+ <package name="cairo" version="1.12.14">\n+ <repository changeset_revision="7f467a4010e0" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="http://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://toolshed.g2.bx.psu.edu" />\n+ </package>\n+ <package name="freetype" version="2.5.2">\n+ <repository changeset_revision="92d1906a12e4" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />\n+ </package>\n+ <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.11.0.tar.gz</action>\n+ <action type="set_environment_for_install">\n+ <repository changeset_revision="16fc64dad9ca" name="package_readline_6_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">\n+ <package name="readline" version="6.2" />\n+ </repository>\n+ '..b'\n+ <repository changeset_revision="7f467a4010e0" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="http://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>\n+ <repository changeset_revision="92d1906a12e4" 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>\n+ </action>\n+ <action type="shell_command">\n+ export LDFLAGS="-L$PNG_LIBS -L$READLINE_LIBS" &&\n+ export LDFLAGS="$LDFLAGS -Wl,-rpath,$READLINE_LIBS" &&\n+ export LDFLAGS="$LDFLAGS -Wl,-rpath,$PIXMAN_LIB_PATH" &&\n+ export LDFLAGS="$LDFLAGS -Wl,-rpath,$PNG_LIB_PATH" &&\n+ export LDFLAGS="$LDFLAGS -Wl,-rpath,$FREETYPE_LIB_PATH" &&\n+ export CFLAGS="-I$PNG_INCLUDES -I$READLINE_INCLUDES" &&\n+ export CXXFLAGS="-I$PNG_INCLUDES -I$READLINE_INCLUDES" &&\n+ export CPPFLAGS="-I$PNG_INCLUDES -I$READLINE_INCLUDES" &&\n+ ./configure --with-tcltk \\\n+ --with-blas \\\n+ --with-lapack \\\n+ --with-readline \\\n+ --with-cairo \\\n+ --with-libpng \\\n+ --without-x \\\n+ --enable-R-shlib \\\n+ --disable-R-framework \\\n+ --libdir=$INSTALL_DIR/lib \\\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+ </actions>\n <action type="set_environment">\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_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>\n- <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/lib/R/bin</environment_variable>\n+ <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>\n </action>\n- </actions>\n+ </actions_group>\n </install>\n <readme>\n- R is a free software environment for statistical computing and graphics.\n- NOTE: See custom compilation options above \n+ The precompiled Linux version of this package was built 2014-03-04.\n+ The precompiled OSX version of this package was built 2014-03-03.\n+ R is a free software environment for statistical computing and graphics.\n+ NOTE: See custom compilation options above.\n </readme>\n </package>\n-</tool_dependency>\n\\ No newline at end of file\n+</tool_dependency>\n'