Mercurial > repos > boris > package_rpy2_2_2

changeset 1:58279878f849 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded updated xml
author boris
date Tue, 04 Feb 2014 12:36:05 -0500
parents 31bb8a2b748e
children 7066d625eb36
files tool_dependencies.xml
diffstat 1 files changed, 17 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Feb 03 12:59:12 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 04 12:36:05 2014 -0500
@@ -6,20 +6,34 @@
     <package name="ape" version="3.0-8">
         <repository changeset_revision="423395d792df" name="package_ape_3_0" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
+    <package name="R" version="2.15.0">
+        <repository changeset_revision="eca882dd6393" name="package_r_2_15_0" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+    </package>
     <package name="rpy2" version="2.2.6">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">https://pypi.python.org/packages/source/r/rpy2/rpy2-2.2.6.tar.gz</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="ff20613e6fee" name="package_readline_6_2" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="ff20613e6fee" name="package_readline_6_2" owner="boris" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.2" />
                     </repository>
-                    <repository changeset_revision="423395d792df" name="package_ape_3_0" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="423395d792df" name="package_ape_3_0" owner="boris" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="ape" version="3.0-8" />
                     </repository>
+                    <repository changeset_revision="eca882dd6393" name="package_r_2_15_0" owner="boris" toolshed="http://toolshed.g2.bx.psu.edu">
+                        <package name="R" version="2.15.0" />
+                    </repository>
                 </action>
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                <action type="shell_command">export R_HOME=$R_HOME &amp;&amp; export R_LIBS=$R_LIBS &amp;&amp; export PATH=$PATH &amp;&amp;export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp;python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                <action type="shell_command">
+                    export R_HOME=$R_HOME &amp;&amp; \
+                    export R_LIBS=$R_LIBS &amp;&amp; \
+                    export PATH=$PATH &amp;&amp; \
+                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; \
+                    export CFLAGS="-I$READLINE_INCLUDES" &amp;&amp; \
+                    export LDFLAGS="-L$READLINE_LIBS" &amp;&amp; \
+                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin
+                </action>
                 <action type="set_environment">
                     <environment_variable action="prepend_to" name="R_HOME">$ENV[R_HOME]</environment_variable>
                     <environment_variable action="prepend_to" name="R_LIBS">$ENV[R_LIBS]</environment_variable>