[jboss-svn-commits] JBL Code SVN: r33810 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2010-07-09 12:44:09 -0400 (Fri, 09 Jul 2010)
New Revision: 33810

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Add conditional processing to the script.

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-09 16:30:34 UTC (rev 33809)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-09 16:44:09 UTC (rev 33810)
@@ -135,24 +135,27 @@
       
    </target>
    
-   <target name="generate-submission-report" if="benchmark.run.pass">
+   <target name="generate-submission-report">
       <echo>Generating submission</echo>
-      
-      <ant antfile="${spec.install.dir}/build.xml" target="reporter" dir="${spec.install.dir}">
-         <property name="runOutputDir" value="${spec.install.dir}/output/${org.spec.internal.runId}"/>
-      </ant>
-      
-      <echo>Copying the generated submission to the output directory.</echo>
-      <copy todir="${spec.install.dir}/output/${org.spec.internal.runId}" >
-         <fileset dir="${spec.install.dir}/submission"/>
-      </copy>
-      
+      <if>
+         <equals arg1="true" arg2="${benchmark.run.pass}"/>
+         <then>
+            <ant antfile="${spec.install.dir}/build.xml" target="reporter" dir="${spec.install.dir}">
+               <property name="runOutputDir" value="${spec.install.dir}/output/${org.spec.internal.runId}"/>
+            </ant>
+            
+            <echo>Copying the generated submission to the output directory.</echo>
+            <copy todir="${spec.install.dir}/output/${org.spec.internal.runId}" >
+               <fileset dir="${spec.install.dir}/submission"/>
+            </copy>
+         </then>
+      </if>
    </target>
    
    <target name="substitute-remote-config">
       <echo>Checking for replacement remote configuration.</echo>
       
-      <condition property="replacement.file.exists">
+      <condition property="replacement.file.exists" else="false">
          <and>
             <isset property="replacement.runconf.file"/>
             <isset property="replacement.runconf.target.name"/>
@@ -160,13 +163,19 @@
          </and>
       </condition>
       
+      <echo>Status of all expected properties and files: ${replacement.file.exists}</echo>
       <antcall target="replace-remote-file" inheritall="true"/>
       
    </target>
    
-   <target name="replace-remote-file" if="replacement.file.exists">
+   <target name="replace-remote-file">
       <echo>Replacing file</echo>
-      <scp localFile="${replacement.runconf.file}" remoteTofile="root at hornetq:${replacement.runconf.target.name}"  failonerror="true" password="${r_p}"/>
+      <if>
+         <equals arg1="true" arg2="replacement.file.exists"/>
+         <then>
+            <scp localFile="${replacement.runconf.file}" remoteTofile="root at hornetq:${replacement.runconf.target.name}"  failonerror="true" password="${r_p}"/>
+         </then>
+      </if>
    </target>