Mercurial > repos > boris > package_rpy2_2_2

changeset 8:f0cc606c0cd5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated xml setting environment variables from R repo
author boris
date Thu, 06 Jun 2013 09:35:12 -0400
parents 7dffbe1a3880
children d0b87be35e2c
files tool_dependencies.xml
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Jun 05 15:20:01 2013 -0400
+++ b/tool_dependencies.xml	Thu Jun 06 09:35:12 2013 -0400
@@ -19,11 +19,11 @@
                 </action>
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
                 <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp;
-                export R_HOME=${R_HOME} &amp;&amp; export R_LIBS=${R_LIBS} &amp;&amp;
+                <!--export R_HOME=${R_HOME} &amp;&amp; export R_LIBS=${R_LIBS} &amp;&amp;-->
                 python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
                 <action type="set_environment">
-                    <environment_variable name="R_HOME" action="set_to">${R_HOME}</environment_variable>
-                    <environment_variable name="R_LIBS" action="set_to">${R_LIBS}</environment_variable>
+                    <environment_variable name="R_HOME" action="set_to">$ENV[R_HOME]</environment_variable>
+                    <environment_variable name="R_LIBS" action="set_to">$ENV[R_LIBS]</environment_variable>
                     <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/lib/python</environment_variable>
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
                 </action>