diff macros.xml @ 40:b1553f2a4942 draft

planemo upload for repository https://github.com/Yating-L/jbrowse-archive-creator.git commit 12fb52d5b285935b2353d93a5aa291838df7893e
author yating-l
date Fri, 20 Apr 2018 12:29:32 -0400
parents 7b955a58d8f2
children
line wrap: on
line diff
--- a/macros.xml	Fri Apr 13 18:21:35 2018 -0400
+++ b/macros.xml	Fri Apr 20 12:29:32 2018 -0400
@@ -1,32 +1,18 @@
 <macros>
     <xml name="verify_hub_structure" token_genome="Dbia3" token_test="common">
-        <extra_files type="directory" value="myHub/@GENOME@/names" compare="re_match"/>
-        <extra_files type="directory" value="myHub/@GENOME@/seq" compare="re_match"/>
-        <extra_files type="directory" value="myHub/@GENOME@/tracks" compare="re_match"/>
-        <extra_files type="file" name="myHub/@GENOME@/css/custom_track_styles.css" value="@TEST@/myHub/@GENOME@/css/custom_track_styles.css" />
-        <extra_files type="file" name="myHub/@GENOME@/tracks.conf" value="@TEST@/myHub/@GENOME@/tracks.conf" />
-        <extra_files type="file" name="myHub/@GENOME@/trackList.json">
-            <assert_contents>
-                <has_text text="tracks"/>
-                <has_text text="css"/>
-                <has_text text="names"/>
-                <has_text text="formatVersion"/>
-            </assert_contents>
-        </extra_files>
+        <expand macro="verify_hub_structure_no_track" test="only_genome" />
+        <extra_files type="directory" value="@TEST@/myHub/tracks" compare="re_match"/>
     </xml>
 
     <xml name="verify_hub_structure_no_track" token_genome="Dbia3" token_test="common">
-        <extra_files type="file" name="myHub/@GENOME@/trackList.json" >
-            <assert_contents>
-                <has_text text="tracks"/>
-                <has_text text="css"/>
-                <has_text text="names"/>
-                <has_text text="formatVersion"/>
-            </assert_contents>
-        </extra_files>
-        <extra_files type="file" name="myHub/@GENOME@/css/custom_track_styles.css" value="@TEST@/myHub/@GENOME@/css/custom_track_styles.css" />
+        <!-- trackList.json -->
+        <extra_files type="file" name="myHub/trackList.json" value="@TEST/myHub/trackList.json" />
+        <!-- seq/refSeqs.json -->
+        <extra_files type="file" name="myHub/seq/refSeqs.json" value="@TEST/myHub/seq/refSeqs.json" />
+        <!-- name/meta.json -->
+        <extra_files type="file" name="myHub/names/meta.json" value="@TEST/myHub/names/meta.json" />
+        <extra_files type="directory" value="@TEST@/myHub/names" compare="re_match"/>
+        <extra_files type="directory" value="@TEST@/myHub/seq" compare="re_match"/>
     </xml>
 
-    
-
 </macros>
\ No newline at end of file