Mercurial > repos > iuc > package_r_3_0_1

changeset 4:e16e08f41ed7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Mon, 30 Sep 2013 12:22:17 -0400
parents cfa5225f7807
children 0a395bcd7efd
files tool_dependencies.xml
diffstat 1 files changed, 17 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Sep 30 12:18:30 2013 -0400
+++ b/tool_dependencies.xml	Mon Sep 30 12:22:17 2013 -0400
@@ -1,37 +1,31 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="atlas" version="3.10.1">
-        <repository changeset_revision="196caf0a85e9" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
-    </package>
-    <package name="readline" version="6.2">
-        <repository changeset_revision="9f3610d5a25b" name="package_readline_6_2" owner="iuc" 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="iuc" prior_installation_required="True" />
+    </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 changeset_revision="196caf0a85e9" name="package_atlas_3_10" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="atlas" version="3.10.1" />
-                    </repository>
-                    <repository changeset_revision="9f3610d5a25b" name="package_readline_6_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                <!--<action type="set_environment_for_install">
+                    <repository name="package_readline_6_2" owner="iuc">
                         <package name="readline" version="6.2" />
                     </repository>
-                </action>
+                </action>-->
 
-                <action language="cheetah" type="template_command">
+                <action type="template_command" language="cheetah">
                     #set $cmd = './configure'
-                    #if env.get('ATLAS_LIB_DIR', False):
-                        #set $cmd += ' --with-blas="-L%s -lptf77blas -lpthread -latlas" ' % $env.ATLAS_LIB_DIR
-                    #end if
 
-                    #if env.get('READLINE_LIB_PATH', False):
-                        export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
-                        export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp;
-                        #set $cmd += ' --with-readline=yes '
-                    #else:
-                        #set $cmd += ' --with-readline=no '
-                    #end if
+                    ###if env.get('READLINE_LIB_PATH', False):
+                    ##    export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
+                    ##    export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp;
+                    ##    #set $cmd += ' --with-readline=yes '
+                    ###else:
+                    ##    #set $cmd += ' --with-readline=no '
+                    ###end if
+
+
+                    #set $cmd += ' --with-readline=no '
 
                     #set $cmd += ' --enable-R-shlib  --with-x=no --libdir=%s/lib/ --bindir=%s/bin/ --datarootdir=%s/share/' % ($env.INSTALL_DIR, $env.INSTALL_DIR, $env.INSTALL_DIR)
                     $cmd