Commit Graph

230 Commits (9ff8a01da2bcd705b0c2fae7fe2d796beac8ba7f)

Author SHA1 Message Date
David Roazen 055364d786 Always use full, three-part version numbers.
Previously, the initial release of a new GATK version had a version
number with only one part (eg., "1.4"). This could potentially mislead
people into thinking it's the most recent revision of a release, instead
of the least recent.

Now, initial releases will have full, three-part version numbers
(eg., "1.4-0-g472fc94") like everything else.
2012-01-03 10:25:19 -05:00
David Roazen 510c71158c Merged bug fix from Stable into Unstable 2011-12-22 10:49:52 -05:00
David Roazen 32cdef9682 Rename *PerformanceTest test classes to *LargeScaleTest
This is in preparation for the installation of the new performance test suite in Bamboo.

Note that "ant performancetest" is now "ant largescaletest"
2011-12-22 10:38:49 -05:00
Matt Hanna d50f9b98bb Make sure that the temporary ReadWalker performance improvement hack
works well in the binary release, jic GATK 1.4 arrives before I get
a Picard patch.
2011-12-20 21:42:30 -05:00
Mark DePristo f0ac588d32 Extensive unit test for GenotypeContextUnitTest
-- Currently only tests base class.  Adding subclass testing in a bit
2011-11-20 18:28:01 -05:00
Mark DePristo 9445326c6c Genotype is Comparable via sampleName 2011-11-20 18:26:27 -05:00
Khalid Shakir b80d407dc7 No more hunting down R "resources". As a tradeoff Rscript cannot be specified on the commandline and will be found in the environment path.
Other minor cleanup.
2011-10-27 14:17:07 -04:00
Khalid Shakir fac9932938 Embedding gsalib source and queueJobReport R scripts in the dist and package jars.
Moved gsalib and queueJobReport.R to embeddable namespaced locations.
Updated packager dependencies/dir to add an @includes which filters the embedded fileset.
RScriptExecutor can now JIT compiles the gsalib.
RScriptExecutor uses ProcessController and sends the Rscript output to java's stdout when run under -l DEBUG.
Refactored ProcessController and IOUtils from Queue to Sting Utils.
Added more unit tests to ProcessController along with a utility class to hard stop OutputStreams at a specified byte count.
Replaced uses of some IOUtils with Apache Commons IO.
ShellJobRunner refactored to use direct ProcessController and now kills jobs on shutdown.
Better QGraph responsiveness on shutdown by using Object.wait() instead of Thread.sleep().
2011-10-24 15:58:34 -04:00
David Roazen 2193da6bfb Merged bug fix from Stable into Unstable 2011-10-16 07:37:20 -04:00
David Roazen dcd4eee15f Revert "Intentionally breaking the binary release as a test."
The test was successful -- the packaging error was detected and
prevented from propagating out into the binary/source releases.

This reverts commit 8f2a1462d94ce50fb7c1b1d0c40142b109e9c38e.
2011-10-16 07:24:33 -04:00
David Roazen 88c9a35b2a Merged bug fix from Stable into Unstable 2011-10-15 20:28:48 -04:00
David Roazen 46badee76a Intentionally breaking the binary release as a test.
This is to test the ability of the new release system
to detect the kinds of packaging errors we couldn't
detect before (in this case, missing codecs). If all goes
as expected, "GSA-Stable: Release" will fail, preventing
the binary release and github from getting updated, while
"GSA-Stable: All Tests" and all of the other old test plans
will pass.

Will revert this in a bit -- if the system works as it should,
our users will never see it until after it's been reverted.
2011-10-15 20:20:41 -04:00
David Roazen 900eb19acb Merged bug fix from Stable into Unstable 2011-10-14 23:05:01 -04:00
David Roazen c756da1798 Remove unnecessary debugger port listening from GATKDoclet invocation.
This caused a race condition between concurrently-running bamboo plans.
2011-10-14 22:59:12 -04:00
David Roazen aad99563be Merged bug fix from Stable into Unstable 2011-10-14 03:26:35 -04:00
David Roazen 442d33ba18 Enable testing of the jars produced by the packaging system.
-Added targets to run unit and integration tests on the fully-packaged GATK jar,
and pipeline tests on the fully-packaged Queue jar. Once enabled in Bamboo,
these will provide greatly-enhanced protection against breakage in the binary
release.

-Unconditionally include all of the subset of org.broadinstitute.sting
included in the intermediate jars GenomeAnalysisTK.jar, StingUtils.jar,
etc. in the final, fully-packaged jar. This:
    * is necessary to get tests to run on the fully-packaged jar
    * decreases the chances of a class that is a runtime-only
      dependency getting left out of the binary release
    * only slightly increases the size of the binary release
      (before: 9352465 bytes, after: 10985482 bytes)
2011-10-14 03:08:28 -04:00
Matt Hanna e19dba86a6 Merged bug fix from Stable into Unstable 2011-10-08 22:37:12 -04:00
Matt Hanna 0016c707a3 Codecs other than VCF accidentally bled into vcf.jar. Unfortunately, vcf.jar
turned out to be the *only* home for these other codecs.  This change pushes
them back into StingUtils.jar.
2011-10-08 22:24:35 -04:00
Matt Hanna 3961733590 Merged bug fix from Stable into Unstable 2011-10-06 12:54:52 -04:00
Matt Hanna 4fa5045e84 Abandoning classfileset/rootfileset approach due to difficulting managing
classloading of bcel*.jar/ant-apache-bcel*.jar.  Switching instead to manually
specifying a minimal set of packages/classes to include in the vcf.jar via
build.xml, and adding a unit test which creates a limited classloader
only aware of vcf.jar and tribble.jar and tries to use it to load the core
classes in the vcf jar.

Hopefully third time's the charm.
2011-10-06 12:49:51 -04:00
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