Mercurial > repos > brenninc > test_r_cairo_27aug2015

changeset 14:c317e667eee3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author brenninc
date Tue, 01 Sep 2015 05:08:15 -0400
parents e8379bbc0069
children b63b56099d97
files tool_dependencies.xml
diffstat 1 files changed, 4 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Sep 01 04:48:34 2015 -0400
+++ b/tool_dependencies.xml	Tue Sep 01 05:08:15 2015 -0400
@@ -1,48 +1,16 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="pixman" version="0.32.4">   
-        <repository changeset_revision="873f53f1abcd" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" 
-                    toolshed="https://testtoolshed.g2.bx.psu.edu" />
-    </package>
-    <package name="libpng" version="1.6.7">
-        <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" 
-                    toolshed="https://testtoolshed.g2.bx.psu.edu" />
-    </package>
-    <package name="freetype" version="2.5.2">
-        <repository changeset_revision="8999860ddf69" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" 
-                    toolshed="https://testtoolshed.g2.bx.psu.edu" />
-     </package>
-     <package name="cairo" version="1.12.14">
-        <repository changeset_revision="5c25a57405a9" name="package_cairo_1_12_14" owner="iuc" prior_installation_required="True" 
-                    toolshed="https://testtoolshed.g2.bx.psu.edu" />
-     </package> 
      <package name="R" version="3.2.1" >
         <repository name="package_r_3_2_1" owner="iuc" changeset_revision="3d28600fc82c" toolshed="https://testtoolshed.g2.bx.psu.edu/"/>
     </package>  
     <package name="R_cairo" version="0.0.2">
         <install version="1.0">
             <actions>
+               <action type="set_environment">
+                    <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">home/christian/galaxy/dependency_dir/R/3.1.2/brenninc/package_r_3_1_2/655087f549e9/include/</environment_variable>
+                    <environment_variable action="set_to" name="CAIRO_CFLAGS/LIBS">home/christian/galaxy/dependency_dir/R/3.1.2/brenninc/package_r_3_1_2/655087f549e9/include/</environment_variable>
+                </action>
                 <action type="setup_r_environment">
-                   <action type="set_environment">
-                        <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">home/christian/galaxy/dependency_dir/R/3.1.2/brenninc/package_r_3_1_2/655087f549e9/include/</environment_variable>
-                        <environment_variable action="set_to" name="CAIRO_CFLAGS/LIBS">home/christian/galaxy/dependency_dir/R/3.1.2/brenninc/package_r_3_1_2/655087f549e9/include/</environment_variable>
-                    </action>
-                    <repository changeset_revision="873f53f1abcd" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" >
-                        <package name="pixman" version="0.32.4"/>   
-                    </repository>  
-                   <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
-                      <package name="libpng" version="1.6.7" />
-                    </repository>
-                     <repository changeset_revision="8999860ddf69" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" >
-                        <package name="freetype" version="2.5.2"/>
-                    </repository>  
-                    <repository name="package_cairo_1_12_14" owner="iuc" prior_installation_required="True" 
-                                changeset_revision="5c25a57405a9" toolshed="https://testtoolshed.g2.bx.psu.edu/" >
-                        <package name="cairo" version="1.12.14" />
-                    </repository>
                     <repository name="package_r_3_2_1" owner="iuc" 
                                 changeset_revision="3d28600fc82c" toolshed="https://testtoolshed.g2.bx.psu.edu/">
                         <package name="R" version="3.2.1" />