changeset 2:8142434b2805 draft

changed R dependency revision
author boris
date Wed, 05 Jun 2013 15:22:27 -0400
parents 4e1ab37145eb
children 66a948a7792e
files tool_dependencies.xml
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Jun 05 14:21:58 2013 -0400
+++ b/tool_dependencies.xml	Wed Jun 05 15:22:27 2013 -0400
@@ -1,19 +1,20 @@
 <tool_dependency>
     <package name="R" version="2.15.0">
-        <repository changeset_revision="ff26ae313d4d" name="package_r_2_15" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/"/>
+        <repository changeset_revision="562ebf52a8fe" name="package_r_2_15" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/"/>
     </package>
     <package name="ape" version="3.0-8">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://cran.r-project.org/src/contrib/ape_3.0-8.tar.gz</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="ff26ae313d4d" name="package_r_2_15" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="562ebf52a8fe" name="package_r_2_15" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                         <package name="R" version="2.15.0"/>
                     </repository>
                 </action>
                 <action type="make_directory">$INSTALL_DIR</action>
-                <action type="shell_command">export R_HOME=$R_HOME &amp;&amp; export R_LIBS=$R_LIBS &amp;&amp; R CMD INSTALL ape_3.0-8.tar.gz -l $INSTALL_DIR </action>
+                <action type="shell_command">export R_HOME=${R_HOME} &amp;&amp; export R_LIBS=${R_LIBS} &amp;&amp; R CMD INSTALL ape_3.0-8.tar.gz -l $INSTALL_DIR </action>
                 <action type="set_environment">
+                <environment_variable name="R_HOME" action="set_to">${R_HOME}</environment_variable>
                 <environment_variable name="R_LIBS" action="prepend_to">$INSTALL_DIR</environment_variable>
                 </action>
             </actions>