Mercurial > repos > bgruening > upload_testing

changeset 93:7ae2e4b1ff1f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bernhardlutz
date Sun, 26 Jan 2014 08:35:17 -0500
parents 66f88a4fe9d9
children 6ef11b60940a
files cor.xml statistic_tools_macros.xml
diffstat 2 files changed, 32 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/cor.xml	Sun Jan 26 08:24:01 2014 -0500
+++ b/cor.xml	Sun Jan 26 08:35:17 2014 -0500
@@ -5,15 +5,16 @@
         <import>statistic_tools_macros.xml</import>
     </macros>
     <command interpreter="python">cor.py $input1 $out_file1 $numeric_columns $method</command>
-  <inputs>
-    <param format="tabular" name="input1" type="data" label="Dataset" help="Dataset missing? See TIP below"/>
-    <param name="numeric_columns" label="Numerical columns" type="data_column" numerical="True" multiple="True" data_ref="input1" help="Multi-select list - hold the appropriate key while clicking to select multiple columns" />
-    <param name="method" type="select" label="Method">
-      <option value="pearson">Pearson</option>
-      <option value="kendall">Kendall rank</option>
-      <option value="spearman">Spearman rank</option>
-    </param>
-  </inputs>
+    <inputs>
+        <param format="tabular" name="input1" type="data" label="Dataset" help="Dataset missing? See TIP below"/>
+        <param name="numeric_columns" label="Numerical columns" type="data_column" numerical="True" multiple="True" data_ref="input1" help="Multi-select list - hold the appropriate key while clicking to select multiple columns" />
+        <param name="method" type="select" label="Method">
+            <option value="pearson">Pearson</option>
+            <option value="kendall">Kendall rank</option>
+            <option value="spearman">Spearman rank</option>
+        </param>
+    </inputs>
+    <expand macro="environment" />
   <outputs>
     <data format="txt" name="out_file1" />
   </outputs>
--- a/statistic_tools_macros.xml	Sun Jan 26 08:24:01 2014 -0500
+++ b/statistic_tools_macros.xml	Sun Jan 26 08:35:17 2014 -0500
@@ -7,4 +7,26 @@
         <requirement type="package" version="6.2">readline</requirement>
     </requirements>
   </xml>
+  <xml name="environment">
+    <install version="1.0">
+            <actions>
+                <action type="set_environment_for_install">
+                    <repository name="package_ncurses_5_9" owner="iuc">
+                        <package name="ncurses" version="5.9" />
+                    </repository>
+                    <repository name="package_readline_6_2" owner="iuc">
+                        <package name="readline" version="6.2" />
+                    </repository>
+                    <repository name="package_r_3_0_1" owner="iuc">
+                        <package name="R_3_0_1" version="3.0.1" />
+                    </repository>
+                </action>
+                <action type="set_environment">
+                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[READLINE_LIB_PATH]</environment_variable>
+                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[NCURSES_LIB_PATH]</environment_variable>
+                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[RHOME]/lib</environment_variable>
+                </action>
+            </actions>
+    </install>
+    </xml>
 </macros>