zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow arbitrary resources to be packaged in the GATK jar, selecting among public/private/protected appropriately 

-Resources must be in a "resources" or "templates" subdirectory within the Java package hierarchy

-Remove direct inclusion of private resources from the main jar packaging target added in Jacob's
patch: this would break builds where the private directory was absent, and did not respect build
settings (include.private, etc.)
This commit is contained in:
David Roazen 2012-11-28 14:06:58 -05:00
parent 1cc0b48caa
commit 26d9c41615
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.xml
View File

@ -226,10 +226,17 @@
<!-- the path for resources that need to go into the GATK jar; <!-- the path for resources that need to go into the GATK jar;
any additional resources should go into this set. --> any additional resources should go into this set. -->
<path id="gatk.resources"> <path id="gatk.resources">
<fileset dir="${basedir}"> <fileset dir="${java.public.source.dir}">
<include name="${java.public.source.dir}/**/templates/*" /> <include name="**/resources/*" />
<include name="${java.private.source.dir}/**/templates/*" if="include.private" /> <include name="**/templates/*" />
<include name="${java.protected.source.dir}/**/templates/*" if="include.protected" /> </fileset>
<fileset dir="${java.private.source.dir}" erroronmissingdir="false">
<include name="**/resources/*" if="include.private" />
<include name="**/templates/*" if="include.private" />
</fileset>
<fileset dir="${java.protected.source.dir}" erroronmissingdir="false">
<include name="**/resources/*" if="include.protected" />
<include name="**/templates/*" if="include.protected" />
</fileset> </fileset>
</path> </path>
@ -681,9 +688,6 @@
<include name="**/gatk/**/*.class" /> <include name="**/gatk/**/*.class" />
<include name="**/alignment/**/*.class"/> <include name="**/alignment/**/*.class"/>
</fileset> </fileset>
<fileset dir="${java.private.source.dir}">
<include name="**/gatk/**/resources/*.*" />
</fileset>
<fileset dir="${R.script.staging.dir}"> <fileset dir="${R.script.staging.dir}">
<include name="**/gatk/**/*.R"/> <include name="**/gatk/**/*.R"/>
<include name="**/alignment/**/*.R"/> <include name="**/alignment/**/*.R"/>