changeset 7:738e7d34477d draft

Uploaded
author bgruening
date Fri, 02 Aug 2013 13:16:00 -0400
parents 0c48b2c85c3c
children ef3a897cf4f2
files tool_dependencies.xml
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Jul 01 09:07:58 2013 -0400
+++ b/tool_dependencies.xml	Fri Aug 02 13:16:00 2013 -0400
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="R_3_0_1" version="3.0.1">
-        <repository changeset_revision="1d5580f2ece0" name="package_r_3_0_1" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="bae5c9880b71" name="package_r_3_0_1" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="readline" version="6.2">
         <repository changeset_revision="b936498ae90c" name="package_readline_6_2" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
@@ -14,16 +14,17 @@
                     <repository changeset_revision="b936498ae90c" name="package_readline_6_2" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.2" />
                     </repository>
-                    <repository changeset_revision="1d5580f2ece0" name="package_r_3_0_1" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="bae5c9880b71" name="package_r_3_0_1" 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; 
-                export LDFLAGS=-L$READLINE_LIB_PATH &amp;&amp; 
-                export CPPFLAGS=-I$READLINE_INCLUDE_PATH &amp;&amp; 
-                python setup.py build --r-home $R_HOME --r-home-lib $R_HOME/lib install --home $INSTALL_DIR</action>
+                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
+                    export LDFLAGS=-L$READLINE_LIB_PATH &amp;&amp; 
+                    export CPPFLAGS=-I$READLINE_INCLUDE_PATH &amp;&amp; 
+                    python setup.py build --r-home $R_HOME --r-home-lib $R_HOME/lib install --install-lib $INSTALL_DIR/lib/python
+                </action>
                 <action type="set_environment">
                     <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                 </action>