changeset 2:4bc1c94efdff draft

Uploaded
author bgruening
date Sun, 30 Jun 2013 19:31:52 -0400
parents dd4ad562094e
children 90e8c7406730
files tool_dependencies.xml
diffstat 1 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Sun Jun 30 18:06:31 2013 -0400
+++ b/tool_dependencies.xml	Sun Jun 30 19:31:52 2013 -0400
@@ -1,23 +1,28 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="R_3_0_1" version="3.0.1">
-        <repository changeset_revision="856591655486" name="precommit_test" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="564b46e4fda7" name="precommit_test" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
-
+    <package name="readline" version="6.2">
+        <repository changeset_revision="782fae4417eb" name="package_readline_6_2" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    </package>
     <package name="rpy2_2_3_6" version="2.3.6">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">https://pypi.python.org/packages/source/r/rpy2/rpy2-2.3.6.tar.gz</action>
-
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="856591655486" name="precommit_test" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="782fae4417eb" name="package_readline_6_2" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <package name="readline" version="6.2" />
+                    </repository>&gt;
+                    <repository changeset_revision="564b46e4fda7" name="precommit_test" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="R_3_0_1" version="3.0.1" />
                     </repository>
                 </action>
 
                 <action type="shell_command">
                 export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                python setup.py install --home $INSTALL_DIR --r-home $R_HOME</action>
+                export LD_LIBRARY_PATH=$READLINE_LIB_PATH &amp;&amp; 
+                python setup.py build --r-home $R_HOME --r-home-lib $R_HOME/lib install --home $INSTALL_DIR</action>
 
                 <action type="set_environment">
                     <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>