Bug fix: build couldn't be forced to core. Now it can be.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@221 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
parent
c4f0b4cab7
commit
cb6a3b7e55
31
build.xml
31
build.xml
|
|
@ -8,23 +8,11 @@
|
||||||
<condition property="target" value="playground" else="core">
|
<condition property="target" value="playground" else="core">
|
||||||
<equals arg1="${env.STING_BUILD_TYPE}" arg2="playground" casesensitive="false"/>
|
<equals arg1="${env.STING_BUILD_TYPE}" arg2="playground" casesensitive="false"/>
|
||||||
</condition>
|
</condition>
|
||||||
<condition property="target.is.playground" value="true">
|
|
||||||
<equals arg1="${target}" arg2="playground"/>
|
|
||||||
</condition>
|
|
||||||
|
|
||||||
<path id="external.dependencies">
|
<path id="external.dependencies">
|
||||||
<fileset dir="lib" includes="*.jar"/>
|
<fileset dir="lib" includes="*.jar"/>
|
||||||
</path>
|
</path>
|
||||||
|
|
||||||
<path id="source">
|
|
||||||
<dirset dir="${source.dir}">
|
|
||||||
<patternset>
|
|
||||||
<include name="org/broadinstitute/sting/*"/>
|
|
||||||
<exclude name="**/playground/**" unless="target.is.playground"/>
|
|
||||||
</patternset>
|
|
||||||
</dirset>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- ivy properties -->
|
<!-- ivy properties -->
|
||||||
<property name="ivy.install.version" value="2.0.0"/>
|
<property name="ivy.install.version" value="2.0.0"/>
|
||||||
<property name="ivy.home" value="${user.home}/.ant"/>
|
<property name="ivy.home" value="${user.home}/.ant"/>
|
||||||
|
|
@ -69,11 +57,24 @@
|
||||||
|
|
||||||
<target name="compile" depends="init,resolve"
|
<target name="compile" depends="init,resolve"
|
||||||
description="compile the source">
|
description="compile the source">
|
||||||
|
<condition property="target.is.playground" value="true">
|
||||||
|
<equals arg1="${target}" arg2="playground"/>
|
||||||
|
</condition>
|
||||||
|
|
||||||
|
<path id="source">
|
||||||
|
<dirset dir="${source.dir}">
|
||||||
|
<patternset>
|
||||||
|
<include name="org/broadinstitute/sting/*"/>
|
||||||
|
<exclude name="**/playground/**" unless="target.is.playground"/>
|
||||||
|
</patternset>
|
||||||
|
</dirset>
|
||||||
|
</path>
|
||||||
|
|
||||||
<!-- Compile the java code from ${src} into build -->
|
<!-- Compile the java code from ${src} into build -->
|
||||||
<javac destdir="build" classpathref="external.dependencies"
|
<javac destdir="build" classpathref="external.dependencies"
|
||||||
debug="true" debuglevel="lines,vars,source">
|
debug="true" debuglevel="lines,vars,source">
|
||||||
<!--compilerarg value="-Xlint:unchecked" /-->
|
<!--compilerarg value="-Xlint:unchecked" /-->
|
||||||
<src refid="source"/>
|
<src refid="source" />
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
@ -168,7 +169,7 @@
|
||||||
<target name="playground" description="force a build of the Sting experimental code">
|
<target name="playground" description="force a build of the Sting experimental code">
|
||||||
<antcall target="dist" inheritAll="true">
|
<antcall target="dist" inheritAll="true">
|
||||||
<param name="target" value="playground" />
|
<param name="target" value="playground" />
|
||||||
</antcall>
|
</antcall>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="test.compile" depends="compile">
|
<target name="test.compile" depends="compile">
|
||||||
|
|
@ -213,7 +214,7 @@
|
||||||
<!-- Javadoc can't take the same dirsets as javac; it only likes getting the base directory -->
|
<!-- Javadoc can't take the same dirsets as javac; it only likes getting the base directory -->
|
||||||
<!-- Exclude playground files with excludepackagenames instead of the "source" dirset -->
|
<!-- Exclude playground files with excludepackagenames instead of the "source" dirset -->
|
||||||
<condition property="package.excludes" value="" else="org.broadinstitute.sting.playground.*">
|
<condition property="package.excludes" value="" else="org.broadinstitute.sting.playground.*">
|
||||||
<equals arg1="${target.is.playground}" arg2="true"/>
|
<equals arg1="${target}" arg2="playground" />
|
||||||
</condition>
|
</condition>
|
||||||
<javadoc destdir="javadoc"
|
<javadoc destdir="javadoc"
|
||||||
sourcepath="${source.dir}"
|
sourcepath="${source.dir}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue