Previous changeset 2:9f2fddb9d6e2 (2015-07-17) Next changeset 4:4d2fd1413b56 (2016-04-07) |
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_r_3_1_2 commit b2bcd58af12d07f49a70215fd331eaa0a135d0c8 |
modified:
tool_dependencies.xml |
b |
diff -r 9f2fddb9d6e2 -r c987143177d4 tool_dependencies.xml --- a/tool_dependencies.xml Fri Jul 17 10:52:54 2015 -0400 +++ b/tool_dependencies.xml Wed Nov 04 09:57:12 2015 -0500 |
[ |
@@ -17,53 +17,53 @@ <actions architecture="x86_64" os="darwin"> <action type="download_by_url">http://cran.rstudio.com/src/base/R-3/R-3.1.2.tar.gz</action> <package name="readline" version="6.2"> - <repository name="package_readline_6_2" owner="iuc" prior_installation_required="True" /> + <repository changeset_revision="52d6f646b3b5" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="libpng" version="1.6.7"> - <repository name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" /> + <repository changeset_revision="f48b920cae1f" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="cairo" version="1.12.14"> - <repository name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" /> + <repository changeset_revision="b39299b4b6e1" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="pixman" version="0.32.4"> - <repository name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" /> + <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="freetype" version="2.5.2"> - <repository name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" /> + <repository changeset_revision="58782940c411" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="ncurses" version="5.9"> - <repository name="package_ncurses_5_9" owner="iuc" prior_installation_required="True" /> + <repository changeset_revision="5e1760c773ba" name="package_ncurses_5_9" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <action type="set_environment_for_install"> - <repository name="package_readline_6_2" owner="iuc" prior_installation_required="True" > + <repository changeset_revision="52d6f646b3b5" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="readline" version="6.2" /> </repository> - <repository name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" > + <repository changeset_revision="f48b920cae1f" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="libpng" version="1.6.7" /> </repository> - <repository name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" > + <repository changeset_revision="b39299b4b6e1" name="package_cairo_1_12_14" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="cairo" version="1.12.14" /> </repository> - <repository name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" > + <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="pixman" version="0.32.4" /> </repository> - <repository name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" > + <repository changeset_revision="58782940c411" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="freetype" version="2.5.2" /> </repository> - <repository name="package_ncurses_5_9" owner="iuc" prior_installation_required="True" > + <repository changeset_revision="5e1760c773ba" name="package_ncurses_5_9" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="ncurses" version="5.9" /> </repository> </action> - <action type="shell_command"><![CDATA[ - export LDFLAGS="-L$PNG_LIBS -L$NCURSES_LIB_PATH -L$READLINE_LIB_PATH" && - export LDFLAGS="$LDFLAGS -Wl,-rpath,$NCURSES_LIB_PATH" && - export LDFLAGS="$LDFLAGS -Wl,-rpath,$READLINE_LIB_PATH" && - export LDFLAGS="$LDFLAGS -Wl,-rpath,$PIXMAN_LIB_PATH" && - export LDFLAGS="$LDFLAGS -Wl,-rpath,$PNG_LIB_PATH" && - export LDFLAGS="$LDFLAGS -Wl,-rpath,$FREETYPE_LIB_PATH" && - export CFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH" && - export CXXFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH" && - export CPPFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH" && + <action type="shell_command"> + export LDFLAGS="-L$PNG_LIBS -L$NCURSES_LIB_PATH -L$READLINE_LIB_PATH" && + export LDFLAGS="$LDFLAGS -Wl,-rpath,$NCURSES_LIB_PATH" && + export LDFLAGS="$LDFLAGS -Wl,-rpath,$READLINE_LIB_PATH" && + export LDFLAGS="$LDFLAGS -Wl,-rpath,$PIXMAN_LIB_PATH" && + export LDFLAGS="$LDFLAGS -Wl,-rpath,$PNG_LIB_PATH" && + export LDFLAGS="$LDFLAGS -Wl,-rpath,$FREETYPE_LIB_PATH" && + export CFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH" && + export CXXFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH" && + export CPPFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH" && ./configure --with-tcltk \ --with-blas \ --with-lapack \ @@ -75,7 +75,7 @@ --disable-R-framework \ --libdir=$INSTALL_DIR/lib \ --prefix=$INSTALL_DIR - ]]></action> + </action> <action type="make_install" /> <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action> <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R</action> |