# HG changeset patch # User bgruening # Date 1375463760 14400 # Node ID 738e7d34477d92e6f2adffc1ad47323e38cd646a # Parent 0c48b2c85c3c57cf61a0c6a647f1891d90b2ef34 Uploaded diff -r 0c48b2c85c3c -r 738e7d34477d tool_dependencies.xml --- 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 && - export LDFLAGS=-L$READLINE_LIB_PATH && - export CPPFLAGS=-I$READLINE_INCLUDE_PATH && - 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 && + export LDFLAGS=-L$READLINE_LIB_PATH && + export CPPFLAGS=-I$READLINE_INCLUDE_PATH && + 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>