From b09bf8b0661dae0823f84add24ed4c5fe74e4ad9 Mon Sep 17 00:00:00 2001
From: Brian LeGros <me@brianlegros.com>
Date: Mon, 3 May 2010 20:04:02 -0400
Subject: [PATCH] Updated dependencies on version.properties for build.  Also
 added build.skipTests and build.skipPmd flags for use when building to avoid
 hacking at the build.  Example: "ant -Dbuild.skipTests=true -v clean package"
 will skip the test phase of the build.

---
 FlexUnit4/build.xml                  | 37 +++++++++++++++-------------
 FlexUnit4AirCIListener/build.xml     |  5 ++--
 FlexUnit4AntTasks/build.xml          |  6 +++--
 FlexUnit4CIListener/build.xml        |  5 ++--
 FlexUnit4FlexCoverListener/build.xml |  5 ++--
 FlexUnit4UIListener/build.xml        |  5 ++--
 build.xml                            |  5 +++-
 7 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index da19148d..5c5d1c2b 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -2,10 +2,11 @@
 <project name="FlexUnit4Core" basedir="." default="package">
    <property environment="env" />
 
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
-
    <!-- Configuration -->
+   <property name="build.artifactId.flex" value="flexunit-core-flex" />
+   <property name="build.artifactId.as3" value="flexunit-core-as3" />
+   <property name="build.finalName.flex" value="${build.artifactId.flex}-${build.version}.${build.number}-sdk${build.sdk}.swc" />
+   <property name="build.finalName.as3" value="${build.artifactId.as3}-${build.version}.${build.number}-sdk${build.sdk}.swc" />
    <property name="build.useFlex" value="true" />
    <property name="instrument.finalName" value="flexunit-instrument.swc" />
    <property name="instrument.metadata" value="flexunit-instrument.cvm" />
@@ -121,7 +122,22 @@
       </fail>
    </target>
 
-   <target name="report">
+   <target name="report" depends="pmdReport">
+      <!-- Pull in class file list to use with asdoc -->
+      <property file="${bin.loc}/flexLib.properties" />
+
+      <!-- Generate asdocs -->
+      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+         <arg line="-doc-classes ${src.class-list}" />
+         <arg line="-source-path+='${src.loc}'" />
+         <arg line="-output '${doc.loc}'" />
+         <arg line="-library-path+='${lib.loc}'" />
+         <arg line="-define=CONFIG::useFlexClasses,${build.useFlex}" />
+      </java>
+   </target>
+   
+   <target name="pmdReport" unless="build.skipPmd">
       <taskdef name="pmd" classname="com.adobe.ac.pmd.ant.FlexPmdAntTask" />
       <taskdef name="cpd" classname="com.adobe.ac.cpd.ant.FlexCpdAntTask" />
       <taskdef name="metrics" classname="com.adobe.ac.pmd.metrics.ant.FlexMetricsAntTask" />
@@ -137,19 +153,6 @@
       </cpd>
 
       <metrics sourcedirectory="${src.loc}" outputfile="${report.loc}/javancss.xml" />
-
-      <!-- Pull in class file list to use with asdoc -->
-      <property file="${bin.loc}/flexLib.properties" />
-
-      <!-- Generate asdocs -->
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-classes ${src.class-list}" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-         <arg line="-define=CONFIG::useFlexClasses,${build.useFlex}" />
-      </java>
    </target>
 
    <target name="package" depends="package-default,package-instrument,report" />
diff --git a/FlexUnit4AirCIListener/build.xml b/FlexUnit4AirCIListener/build.xml
index 5b6fd4e1..7b3be199 100644
--- a/FlexUnit4AirCIListener/build.xml
+++ b/FlexUnit4AirCIListener/build.xml
@@ -2,10 +2,9 @@
 <project name="FlexUnit4AirCIListener" basedir="." default="package">
    <property environment="env" />
 
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
-
    <!-- Configuration -->
+   <property name="build.artifactId" value="flexunit-aircilistener" />
+   <property name="build.finalName" value="${build.artifactId}-${build.version}.${build.number}-sdk${build.sdk}.swc" />
    <property name="build.useFlex" value="true" />
 
    <!-- Existing -->
diff --git a/FlexUnit4AntTasks/build.xml b/FlexUnit4AntTasks/build.xml
index 4651474b..863f46ba 100644
--- a/FlexUnit4AntTasks/build.xml
+++ b/FlexUnit4AntTasks/build.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="FlexUnitAntTasks" basedir="." default="package">
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
+
+   <!--Configuration-->
+   <property name="build.artifactId" value="flexUnitTasks" />
+   <property name="build.finalName" value="${build.artifactId}-${build.version}.${build.number}.jar" />
 
    <!-- Existing -->
    <property name="src.loc" location="${basedir}/src" />
diff --git a/FlexUnit4CIListener/build.xml b/FlexUnit4CIListener/build.xml
index a8dd2b66..81916130 100644
--- a/FlexUnit4CIListener/build.xml
+++ b/FlexUnit4CIListener/build.xml
@@ -2,10 +2,9 @@
 <project name="FlexUnit4CIListener" basedir="." default="package">
    <property environment="env" />
 
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
-
    <!-- Configuration -->
+   <property name="build.artifactId" value="flexunit-cilistener" />
+   <property name="build.finalName" value="${build.artifactId}-${build.version}.${build.number}-sdk${build.sdk}.swc" />
    <property name="build.useFlex" value="true" />
 
    <!-- Existing -->
diff --git a/FlexUnit4FlexCoverListener/build.xml b/FlexUnit4FlexCoverListener/build.xml
index ba47f1ba..af127e35 100644
--- a/FlexUnit4FlexCoverListener/build.xml
+++ b/FlexUnit4FlexCoverListener/build.xml
@@ -2,10 +2,9 @@
 <project name="FlexUnit4FlexCoverListener" basedir="." default="package">
    <property environment="env" />
 
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
-
    <!-- Configuration -->
+   <property name="build.artifactId" value="flexunit-flexcoverlistener" />
+   <property name="build.finalName" value="${build.artifactId}-${build.version}.${build.number}-sdk${build.sdk}.swc" />
    <property name="build.useFlex" value="true" />
 
    <!-- Existing -->
diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml
index ad288583..73002018 100644
--- a/FlexUnit4UIListener/build.xml
+++ b/FlexUnit4UIListener/build.xml
@@ -2,10 +2,9 @@
 <project name="FlexUnit4UIRunner" basedir="." default="package">
    <property environment="env" />
 
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
-
    <!-- Configuration -->
+   <property name="build.artifactId" value="flexunit-uilistener" />
+   <property name="build.finalName" value="${build.artifactId}-${build.version}.${build.number}-sdk${build.sdk}.swc" />
    <property name="build.namespace" value="http://www.adobe.com/2009/flexUnitUIRunner" />
    <property name="build.useFlex" value="true" />
 
diff --git a/build.xml b/build.xml
index d990f601..f2fe3b26 100644
--- a/build.xml
+++ b/build.xml
@@ -16,6 +16,9 @@ to contribute to our CI process.
 <project name="FlexUnit4" basedir="." default="package">
    <property environment="env" />
 
+   <!-- Version info -->
+   <property file="${basedir}/version.properties" />
+
    <!-- Configuration -->
    <property name="build.useFlex" value="true" />
    <property name="finalName" value="flexunit.zip" />
@@ -80,7 +83,7 @@ to contribute to our CI process.
    </target>
 
    <!-- Prepares and builds the FlexUnit4Test project -->
-   <target name="test" depends="anttasks,core,cilistener,flexcoverlistener">
+   <target name="test" depends="anttasks,core,cilistener,flexcoverlistener" unless="build.skipTests">
       <ant dir="${tests.loc}" target="test" inheritall="false">
          <propertyset>
             <propertyref prefix="build" />