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

Somehow checked in a version that was building extensions for everything ("") instead of selected packages. Fixed. 

Also added more logging when extension generation fails.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5812 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
kshakir 2011-05-16 16:58:37 +00:00
parent a27e8b1dc6
commit 541b5f7a80
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
View File

@ -24,7 +24,6 @@
package org.broadinstitute.sting.queue.extensions.gatk; package org.broadinstitute.sting.queue.extensions.gatk;
import net.sf.picard.filter.SamRecordFilter;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -136,9 +135,13 @@ public class GATKExtensionsGenerator extends CommandLineProgram {
for (Class<? extends CommandLineProgram> clp: clpManager.getPlugins()) { for (Class<? extends CommandLineProgram> clp: clpManager.getPlugins()) {
if (!isGatkProgram(clp)) try {
if (!isGatkProgram(clp)) {
logger.debug("Skipping: " + clp);
continue; continue;
}
logger.debug("Generating: " + clp);
String clpClassName = clpManager.getName(clp); String clpClassName = clpManager.getName(clp);
String clpConstructor = String.format("analysisName = \"%s\"%njavaMainClass = \"%s\"%n", clpClassName, clp.getName()); String clpConstructor = String.format("analysisName = \"%s\"%njavaMainClass = \"%s\"%n", clpClassName, clp.getName());
@ -148,6 +151,7 @@ public class GATKExtensionsGenerator extends CommandLineProgram {
if (clp == CommandLineGATK.class) { if (clp == CommandLineGATK.class) {
for (Entry<String, Collection<Class<? extends Walker>>> walkersByPackage: walkerManager.getWalkerNamesByPackage(false).entrySet()) { for (Entry<String, Collection<Class<? extends Walker>>> walkersByPackage: walkerManager.getWalkerNamesByPackage(false).entrySet()) {
for(Class<? extends Walker> walkerType: walkersByPackage.getValue()) { for(Class<? extends Walker> walkerType: walkersByPackage.getValue()) {
try {
String walkerName = walkerManager.getName(walkerType); String walkerName = walkerManager.getName(walkerType);
List<ArgumentField> argumentFields = new ArrayList<ArgumentField>(); List<ArgumentField> argumentFields = new ArrayList<ArgumentField>();
@ -165,10 +169,16 @@ public class GATKExtensionsGenerator extends CommandLineProgram {
writeClass(GATK_EXTENSIONS_PACKAGE_NAME + "." + clpClassName, walkerName, writeClass(GATK_EXTENSIONS_PACKAGE_NAME + "." + clpClassName, walkerName,
isScatter, constructor, argumentFields, dependents); isScatter, constructor, argumentFields, dependents);
} catch (Exception e) {
throw new ReviewedStingException("Error generating wrappers for walker " + walkerType, e);
} }
} }
} }
} }
} catch (Exception e) {
throw new ReviewedStingException("Error generating wrappers for " + clp, e);
}
}
for (Class<? extends ReadFilter> filter: filterManager.getValues()) { for (Class<? extends ReadFilter> filter: filterManager.getValues()) {
String filterName = filterManager.getName(filter); String filterName = filterManager.getName(filter);
@ -190,7 +200,7 @@ public class GATKExtensionsGenerator extends CommandLineProgram {
private static final List<String> gatkPackages = Arrays.asList( private static final List<String> gatkPackages = Arrays.asList(
"org.broadinstitute.sting.gatk", "org.broadinstitute.sting.gatk",
"org.broadinstitute.sting.analyzecovariates", "org.broadinstitute.sting.analyzecovariates",
""); "org.broadinstitute.sting.gatk.datasources.reads.utilities");
/** /**
* Returns true if the class is part of the GATK. * Returns true if the class is part of the GATK.