Mercurial > repos > bgruening > package_r_3_0_1

changeset 3:8dc463c6cbe8 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Wed, 10 Jul 2013 15:27:05 -0400
parents 1d5580f2ece0
children abd431ea5ce0
files tool_dependencies.xml
diffstat 1 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Jul 01 08:21:45 2013 -0400
+++ b/tool_dependencies.xml	Wed Jul 10 15:27:05 2013 -0400
@@ -1,8 +1,5 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="lapack" version="3.4.2">
-        <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 changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
@@ -18,18 +15,23 @@
                     <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 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="b936498ae90c" name="package_readline_6_2" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.2" />
                     </repository>
                 </action>
 
-                <action type="shell_command">
-                    export LDFLAGS=-L$READLINE_LIB_PATH &amp;&amp; 
-                    export CPPFLAGS=-I$READLINE_INCLUDE_PATH &amp;&amp; 
-                    ./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 &amp;&amp; make &amp;&amp; make install
+                <action language="cheetah" type="template_command">
+                    export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
+                    export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp; 
+                    
+                    #set $cmd = './configure'
+                    #if env.get('ATLAS_LIB_DIR', False):
+                        #$cmd += '--with-blas="-L$env.ATLAS_LIB_DIR -lptf77blas -lpthread -latlas" '
+                    #end if
+                    
+                    #$cmd += '--enable-R-shlib  --with-x=no --with-readline=yes --prefix=$env.INSTALL_DIR'
+                    
+                    $cmd &amp;&amp; make &amp;&amp; make install
                 </action>
                 <action type="set_environment">
                     <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>