Commit Graph

210 Commits (2f12bfaad5f606bacfafc0dd105bd2f48723d61a)

Author SHA1 Message Date
Matt Hanna 2f12bfaad5 Merged bug fix from Stable into Unstable 2011-10-06 10:10:00 -04:00
Matt Hanna efca1fdfd8 Revert change until I figure out how to use classfileset/rootfileset
with a vanilla ant install.

This reverts commit 4c9022872beec8dc0700a1320a267e3603c8212d.
2011-10-06 10:08:48 -04:00
Mark DePristo b945e97de1 Shouldn't have committed the non-fetching version by default 2011-10-05 17:12:48 -07:00
Matt Hanna 982983355f Merged bug fix from Stable into Unstable 2011-10-05 18:27:29 -04:00
Matt Hanna dd780dba5f Rather than just picking a few classes to be the roots of the vcf jar and
including all dependencies, use the entire codecs.vcf and variantcontext
packages as roots.

Fix for my fix for Jim Robinson.
2011-10-05 18:25:26 -04:00
David Roazen b732f740d2 Revert "Change vcf jar to use a classfileset to pull all dependencies. Should save"
This reverts commit 441022c4c600624928da46419a6a289200700f3e.
2011-10-05 16:51:30 -04:00
Matt Hanna 88c2fad64f Change vcf jar to use a classfileset to pull all dependencies. Should save
Jim Robinson some detective work in the long run.
2011-10-04 13:14:39 -04:00
Mark DePristo b20689ff55 No longer supports extraProperties
-- the underlying data structure is still present, but until I decide what to do for the extensible system I've completely disabled the subsystem
-- Added code to merge Samples, so that a mostly full record can be merged with a consistent empty record.  If the two records are inconsistent, an error is thrown
-- addSample() in Sample.class now invokes mergeSample() when appropriate
-- Validation types are now only STRICT or SILENT
-- Validation code implemented in SampleDBBuilder
-- Extensive unit tests for SampleDBBuilder
2011-10-03 19:20:33 -07:00
Khalid Shakir 61b89e236a To work around potential problem with invalid javax.mail 1.4.1 in ivy cache, added explicit javax.mail 1.4.4 along with build.xml code to remove 1.4.1. 2011-09-20 00:14:35 -04:00
David Roazen 6bd8a53efd Fix nasty bug involving the build report generation when multiple test targets are specified on the same command line.
Ant immutable properties: sometimes your friend, often your enemy.
2011-09-09 12:13:10 -04:00
David Roazen 60a3618845 Added "alltests" build targets.
To run the same set of tests as the bamboo "All Tests" plan (unit tests,
integration tests, and pipeline tests):

ant alltests

To do the same as above on only the public portion of the codebase:

ant alltests.public
2011-09-09 12:13:10 -04:00
David Roazen 388c9a9c55 Enable public-only tests.
Public-only tests will allow us to check for runtime public -> private
dependencies when bamboo updates the github repository (currently, we
only check for *compile-time* public -> private dependencies).

To compile/run only public tests, append ".public" to the name of an existing
test target:

ant test.public
ant integrationtest.public
ant performancetest.public
ant pipelinetest.public
ant pipelinetestrun.public
2011-09-08 15:58:42 -04:00
David Roazen 50908fe285 Enable conditional inclusion of documentation for hidden features in GATKDocs.
To include documentation for hidden features in the generated GATKDocs,
run with -Dgatkdocs.include.hidden=true

I will enable this flag when bamboo generates GATKDocs for unstable.
2011-08-27 03:38:01 -04:00
David Roazen ccfed5d64d Enable Contracts for Java by default for test targets.
Contracts remain disabled for non-test build targets. To enable for
non-test targets, run with -Duse.contracts=true. To disable for test
targets, run with -Duse.contracts=false.
2011-08-27 02:45:47 -04:00
Mark DePristo f39d0008bc Build.xml -- contracts not built by default. Slightly simpler CSS for dl. 2011-08-19 15:07:26 -04:00
Mark DePristo 198955f752 GATKDoc descriptions for all standard codecs, or TODO for their owners
-- Also added vcf.gz support in the VCF codec.  This wasn't committed in the last round, because it was missed by the parallel documentation effort.
2011-08-19 09:57:21 -04:00
David Roazen 6ee8a3a8dd Fixing the javadoc/scaladoc targets in build.xml
Usable targets are now:

ant javadoc           (public-only)
ant javadoc.private   (public + private)
ant scaladoc          (public-only)
ant scaladoc.private  (public + private)

As documented in the comments, you need to set the ANT_OPTS environment
variable to -Xmx1G before using the scaladoc targets.

Will modify bamboo to auto-generate these and post them to the web after
successful builds.
2011-08-11 19:24:41 -04:00
David Roazen bd5cdb8a43 The tribble dependency is now handled through ivy. Revved tribble to r18 and removed obsolete build targets in build.xml 2011-08-11 16:38:29 -04:00
Mark DePristo 4d88e72958 Merge remote-tracking branch 'remotes/khalid/rodRefactor' into rodRefactor
Conflicts:
	public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java
	public/java/test/org/broadinstitute/sting/BaseTest.java
2011-08-07 10:32:27 -04:00
Khalid Shakir f049461120 Changed @Argument to @Input on input RodBindings.
Changed shortname collision with longname.
Restored scala builds.
Updated HSP to use new syntax.
2011-08-06 20:44:19 -04:00
Mark DePristo b68ed62632 Clean now removes gatkdocs 2011-08-03 18:11:22 -04:00
Mark DePristo b25140db83 Contracts and documentation for some of RefMetaDataTracker
Continuing to fix integration tests that don't pass / run
2011-08-03 13:34:20 -04:00
Mark DePristo a366f9a18d Updating tools to use the RodBinding<T> syntax 2011-08-02 14:05:51 -04:00
Kiran V Garimella ab69b8e4ee Merged bug fix from Stable into Unstable 2011-07-27 12:37:34 -04:00
Kiran V Garimella 6ebd83478b Fixed build.xml to reflect path changes for gsalib 2011-07-27 12:37:00 -04:00
Kiran V Garimella ada2f21976 Revert "Merge branch 'master' of ssh://copper.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable"
This reverts commit 9c81ef835a3ac581d4eb9cf1243e30df20a46795, reversing
changes made to f23d3ad5aec1c70cc1ecc48b295258aa70d30c7d.
2011-07-27 12:27:17 -04:00
Kiran V Garimella dc8061e7a6 Moved gsalib from private/ to public/ 2011-07-27 10:34:56 -04:00
Matt Hanna 6fd6684e86 Merged bug fix from Stable into Unstable
Conflicts:
	build.xml
2011-07-25 15:21:17 -04:00
Matt Hanna 6f43284053 Switch to including our entire exception tree rather than just UserException. 2011-07-25 15:19:41 -04:00
Matt Hanna af0b5883c3 In unstable, add a reference to DocumentedGATKFeature to vcf.jar, which is now
a static dependency of UserExceptions.
2011-07-25 14:36:12 -04:00
Matt Hanna 6c49197de6 Merged bug fix from Stable into Unstable 2011-07-25 14:32:33 -04:00
Matt Hanna a00e302321 Fix formatting issue. 2011-07-25 14:31:40 -04:00
Mark DePristo c6af4efcdc Implemented see also and version header 2011-07-24 16:10:17 -04:00
Mark DePristo 7420ed098e Semi-working version of extraDocs tag in annotation to refer to one capability being accessible in another
Required a significant refactoring of the GATKDoclet, which now has a unified place where the ClassDoc, class, annotation, and handler are all stored together.
2011-07-23 22:07:30 -04:00
Mark DePristo 999acacfa1 Merge branch 'master' into help 2011-07-23 20:19:33 -04:00
Mark DePristo e262f4e10b gatkdoc now generalized to use @Annotation. Multiple subsystems now use annotation to receive docs
Index expanded to use summary() annotation field
UserExceptions, ReadFilters, GATK engine all use the system to generate docs
Doclet expanded to handle lots of new cases
2011-07-23 20:00:35 -04:00
Khalid Shakir 1f8fc4a041 Added edu.mit.broad.picard to Queue packaged jar.
Added hack to workaround EDU.oswego namespace and staging on mac case-insensitive filesystems.
2011-07-23 14:40:29 -04:00
Mark DePristo f0be7348be Generalized handler to allow it to be used with any arbitrary class structure.
DocumentedGATKFeature now includes a field for the group name.
Build.xml works with public / private now.
2011-07-22 14:07:40 -04:00
Mark DePristo e892489696 V2 of the document system.
Now uses GATKDoc class to organize documentation for arguments.
Arguments now listed by feature (required, optional, hidden, etc) and link to detailed information about the argument in the html
Lots of code moving between Class and ClassDoc objects.  Should be refactored into a single static utility class.
2011-07-21 15:20:34 -04:00
Mark DePristo 6fa17d86ae Completely hacked together version of a FreeMarker + javadoc + custom doclet walker documentation generator 2011-07-21 00:18:07 -04:00
Mauricio Carneiro 0cac5e9ebe Merged bug fix from Stable into Unstable 2011-07-15 19:38:20 -04:00
Mauricio Carneiro 1e4798d5d0 Added targets to build.xml to re-run only tests that have failed (integration, unit, performance or pipeline tests).
This is very useful and easy. After running any test (for example ant integrationtest) and seeing failures, you can rerun ONLY THE TESTS THAT FAILED by using one of the following commands:

ant failed-integration
ant failed-pipeline
ant failed-test
ant failed-performance

obviously matching whatever tests you were running and got failures on.

This should run only the failed tests, and you can keep using this command until you have fixed everything.

(Thanks to David Roazen for major help with ANT)
2011-07-15 19:34:14 -04:00
Mark DePristo f313e14e4e Now deletes the dump directory on ant clean
Moving diffengine tests from private to public
2011-07-12 08:50:58 -04:00
David Roazen 68e19edf59 Merged bug fix from Stable into Unstable, and resolved merge conflicts.
Conflicts:
	build.xml
	settings/ivysettings.xml
2011-07-08 15:50:31 -04:00
David Roazen a3c9d9c3ff Fixing Contracts for Java, and enabling contracts by default for unit/integration tests.
The NullPointerException we were seeing when trying to run with contracts enabled was being caused
by an outdated version of the asm library.

To run tests without contracts and disable their compilation, pass in "-Duse.contracts=false" to ant.

Also did some minor unrelated cleanup in build.xml
2011-07-08 15:34:39 -04:00
Mark DePristo 8add2a3866 Merge branch 'master' into diffengine 2011-07-08 09:15:54 -04:00
Khalid Shakir 515553c801 Merged bug fix from Stable into Unstable 2011-07-06 11:34:13 -04:00
Khalid Shakir c93d0b37a8 Fixed namespace of the pipeline classes. 2011-07-06 11:32:46 -04:00
Khalid Shakir 7b699f8b17 Switched GridEngine from looking from environment variable to using embedded jar. 2011-07-05 21:59:00 -04:00
Mark A. DePristo 080875d5da Refactored DiffNode/DiffElement/DiffValue class structure. DiffElement is now a pair of Name -> Value, where value is either a DiffValue or its subclass DiffNode. Code cleaned up, more tests added. DiffEngine is now working, with tests. DiffObjectWalker can now take two VCFs and itemize the difference between the two files correctly and concisely. 2011-07-05 16:13:39 -04:00