From cb6a3b7e559887bdce1a3bc1030509262ed7e79e Mon Sep 17 00:00:00 2001
From: hanna <hanna@348d0f76-0448-11de-a6fe-93d51630548a>
Date: Sun, 29 Mar 2009 01:36:25 +0000
Subject: [PATCH] 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
---
 build.xml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 206befff6..b658d1d10 100644
--- a/build.xml
+++ b/build.xml
@@ -8,23 +8,11 @@
     <condition property="target" value="playground" else="core">
         <equals arg1="${env.STING_BUILD_TYPE}" arg2="playground" casesensitive="false"/>
     </condition>
-    <condition property="target.is.playground" value="true">
-        <equals arg1="${target}" arg2="playground"/>
-    </condition>
 
     <path id="external.dependencies">
         <fileset dir="lib" includes="*.jar"/>
     </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 -->
     <property name="ivy.install.version" value="2.0.0"/>
     <property name="ivy.home" value="${user.home}/.ant"/>
@@ -69,11 +57,24 @@
 
     <target name="compile" depends="init,resolve"
             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 -->
         <javac destdir="build" classpathref="external.dependencies"
                debug="true" debuglevel="lines,vars,source">
             <!--compilerarg value="-Xlint:unchecked" /-->
-            <src refid="source"/>
+            <src refid="source" />
         </javac>
     </target>
 
@@ -168,7 +169,7 @@
     <target name="playground" description="force a build of the Sting experimental code">
         <antcall target="dist" inheritAll="true">
             <param name="target" value="playground" />
-        </antcall>
+	</antcall>
     </target>
 
     <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 -->
 	<!-- Exclude playground files with excludepackagenames instead of the "source" dirset -->
 	<condition property="package.excludes" value="" else="org.broadinstitute.sting.playground.*">
-          <equals arg1="${target.is.playground}" arg2="true"/>
+          <equals arg1="${target}" arg2="playground" />
 	</condition>
         <javadoc destdir="javadoc" 
 		 sourcepath="${source.dir}"