changeset 4:261a3d45a38a

Once again testing complex dependencies
author melissacline
date Thu, 04 Sep 2014 14:51:04 -0700
parents cae2b765ca5d
children f1bc70b543e7
files tool_dependencies.xml xena_import.xml
diffstat 2 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Sep 03 16:02:24 2014 -0700
+++ b/tool_dependencies.xml	Thu Sep 04 14:51:04 2014 -0700
@@ -1,13 +1,6 @@
 <?xml version="1.0"?>
 <tool_dependency>
-  <package name="installXena2" version="1.0">
-    <install version="1.0">
-      <actions>
-	<action type="set_environment">
-          <environment_variable name="XENA_BASE_DIR" action="set_to">${__tool_d\
-ata_path__}/shared//xena</environment_variable>
-        </action>
-      </actions>
-    </install>
+  <package name="installXena" version="1.0">
+    <repository toolshed="http://http://medbook.ucsc.edu:9009/" name="start_xena"/>
   </package>
 </tool_dependency>
--- a/xena_import.xml	Wed Sep 03 16:02:24 2014 -0700
+++ b/xena_import.xml	Thu Sep 04 14:51:04 2014 -0700
@@ -1,7 +1,7 @@
 <tool id="xenaImport" description="XENA Import" name="XENA Import" version="0.0.1">
   <description>Import into the Xena VM</description>
   <requirements>
-    <requirement type="package" version="1.0">installXena2</requirement>
+    <requirement type="package" version="1.0">installXena</requirement>
   </requirements>
   <command interpreter="python">
     xena_import.py ${xenaInputData} ${cohort} ${metadataType}