Mercurial > repos > bgruening > precommit_test
changeset 13:564b46e4fda7 draft
Uploaded
author | bgruening |
---|---|
date | Sun, 30 Jun 2013 19:30:17 -0400 |
parents | 856591655486 |
children | b738c51af132 |
files | tool_dependencies.xml |
diffstat | 1 files changed, 16 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/tool_dependencies.xml Sun Jun 30 18:05:17 2013 -0400 +++ b/tool_dependencies.xml Sun Jun 30 19:30:17 2013 -0400 @@ -1,32 +1,31 @@ <?xml version="1.0"?> <tool_dependency> - <!-- <package name="lapack" version="3.4.2"> - <repository name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" /> + <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" /> </package> <package name="atlas" version="3.10.1"> - <repository name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" /> + <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" /> </package> - <package name="readline" version="6.2"> - <repository name="package_readline_6_2" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/" /> + <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="R_3_0_1" version="3.0.1"> <install version="1.0"> <actions> <action type="download_by_url">http://cran.ms.unimelb.edu.au/src/base/R-3/R-3.0.1.tar.gz</action> - <!-- <action type="set_environment_for_install"> - <repository name="package_atlas_3_10" owner="bgruening"> + <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu"> <package name="atlas" version="3.10.1" /> </repository> - <repository name="package_lapack_3_4" owner="bgruening"> + <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu"> <package name="lapack" version="3.4.2" /> </repository> + <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> </action> - --> + <!-- with-blas="$LAPACK_LIB_DIR" with-lapack="-L$ATLAS_LIB_DIR -llapack -lcblas" @@ -34,22 +33,20 @@ export BLAS=$LAPACK_LIB_DIR/libblas.a && export LAPACK=$LAPACK_LIB_DIR/liblapack.a && export ATLAS=$ATLAS_LIB_DIR/libatlas.a && - - - <action type="set_environment_for_install"> - <repository changeset_revision="1301ec7705a8" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/"> - <package name="readline" version="6.2" /> - </repository> +LD_LIBRARY_PATH + --> + <action type="shell_command"> + export LD_LIBRARY_PATH=$READLINE_LIB_PATH && + ./configure --with-lapack="-L$ATLAS_LIB_DIR -llapack -lcblas" --with-blas="$LAPACK_LIB_DIR" --enable-R-shlib --with-x=no --with-readline=yes --prefix=$INSTALL_DIR && make && make install </action> - --> - <action type="shell_command">./configure --enable-R-shlib --with-x=no --with-readline=no --prefix=$INSTALL_DIR && make && make install</action> <action type="set_environment"> <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable> <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable> <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/lib/R/bin</environment_variable> + <environment_variable action="append_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/R/lib</environment_variable> </action> </actions> </install> - <readme></readme> + <readme /> </package> </tool_dependency>