/[pdpsoft]/branches/nl.nikhef.jgridstart-flyingsaucer/nl.nikhef.jgridstart/build.xml
ViewVC logotype

Diff of /branches/nl.nikhef.jgridstart-flyingsaucer/nl.nikhef.jgridstart/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1348 by wvengen, Thu Jan 7 16:00:38 2010 UTC revision 1349 by wvengen, Fri Jan 8 14:56:22 2010 UTC
# Line 65  Line 65 
65            -->            -->
66    
67          <property name="dep.bouncycastle" location="${dir.thirdparty}/bouncycastle/bcprov-jdk15-144.jar"/>          <property name="dep.bouncycastle" location="${dir.thirdparty}/bouncycastle/bcprov-jdk15-144.jar"/>
         <basename property="dep.bouncycastle.basename" file="${dep.bouncycastle}"/>  
68          <property name="dep.bouncycastle.smime" location="${dir.thirdparty}/bouncycastle/bcmail-jdk15-144.jar"/>          <property name="dep.bouncycastle.smime" location="${dir.thirdparty}/bouncycastle/bcmail-jdk15-144.jar"/>
69          <property name="dep.bouncycastle.tsp" location="${dir.thirdparty}/bouncycastle/bctsp-jdk15-144.jar"/>          <property name="dep.bouncycastle.tsp" location="${dir.thirdparty}/bouncycastle/bctsp-jdk15-144.jar"/>
70          <property name="dep.javamail" location="${dir.thirdparty}/bouncycastle/mail-1.4.1.jar"/>          <property name="dep.javamail" location="${dir.thirdparty}/bouncycastle/mail-1.4.1.jar"/>
# Line 281  Line 280 
280                  <!-- sign, required for java web start -->                  <!-- sign, required for java web start -->
281                  <signjar keystore="${keystore.file}" jar="${dir.dist}/${target.name}.jar"                  <signjar keystore="${keystore.file}" jar="${dir.dist}/${target.name}.jar"
282                          alias="${keystore.alias}" storepass="${keystore.passwd}"/>                          alias="${keystore.alias}" storepass="${keystore.passwd}"/>
                 <delete file="${keystore.tempfile}" quiet="true"/>  
283                  <!-- substitute variables in java web start files -->                  <!-- substitute variables in java web start files -->
284                  <copy file="${dir.dist}/${target.name}.jnlp.in" tofile="${dir.dist}/${target.name}.jnlp" />                  <copy file="${dir.dist}/${target.name}.jnlp.in" tofile="${dir.dist}/${target.name}.jnlp" />
285                  <copy file="${dir.dist}/${tests.guitarget.name}.jnlp.in" tofile="${dir.dist}/${tests.guitarget.name}.jnlp" />                  <copy file="${dir.dist}/${tests.guitarget.name}.jnlp.in" tofile="${dir.dist}/${tests.guitarget.name}.jnlp" />
                 <copy file="${dir.dist}/bcprov.jnlp.in" tofile="${dir.dist}/bcprov.jnlp" />  
286                  <replace dir="${dir.dist}">                  <replace dir="${dir.dist}">
287                          <include name="${target.name}.jnlp"/>                          <include name="${target.name}.jnlp"/>
288                          <include name="${tests.guitarget.name}.jnlp"/>                          <include name="${tests.guitarget.name}.jnlp"/>
                         <include name="bcprov.jnlp"/>  
289                          <replacefilter token="@wwwbase@" value="${wwwbase}"/>                          <replacefilter token="@wwwbase@" value="${wwwbase}"/>
290                          <replacefilter token="@main@" value="${target.main}"/>                          <replacefilter token="@main@" value="${target.main}"/>
291                          <replacefilter token="@tests.main@" value="${tests.guitarget.main}"/>                          <replacefilter token="@tests.main@" value="${tests.guitarget.main}"/>
292                          <replacefilter token="@tests.name@" value="${tests.guitarget.name}"/>                          <replacefilter token="@tests.name@" value="${tests.guitarget.name}"/>
293                  </replace>                  </replace>
294                  <!-- copy bouncycastle jar to deployment area -->                  <!-- copy bouncycastle jar to deployment area; also sign it -->
295                  <copy file="${dep.bouncycastle}" tofile="${dir.dist}/bcprov.jar"/>                  <copy file="${dep.bouncycastle}" tofile="${dir.dist}/bcprov.jar"/>
296                    <signjar keystore="${keystore.file}" jar="${dir.dist}/bcprov.jar"
297                            alias="${keystore.alias}" storepass="${keystore.passwd}"/>
298                    <delete file="${keystore.tempfile}" quiet="true"/>
299          </target>          </target>
300    
301          <!--          <!--
# Line 305  Line 304 
304          <target name="clean">          <target name="clean">
305                  <delete dir="${dir.build}"/>                  <delete dir="${dir.build}"/>
306                  <delete file="${dir.dist}/${target.name}.jar"/>                  <delete file="${dir.dist}/${target.name}.jar"/>
307                    <delete file="${dir.dist}/${target.name}.large.jar"/>
308                    <delete file="${dir.dist}/${target.name}.small.jar"/>
309                  <delete file="${dir.dist}/${target.name}.jnlp"/>                  <delete file="${dir.dist}/${target.name}.jnlp"/>
310                  <delete file="${dir.dist}/bcprov.jnlp"/>                  <delete file="${dir.dist}/bcprov.jar"/>
                 <delete file="${dir.dist}/${dep.bouncycastle.basename}"/>  
311                  <delete file="${dir.dist}/${browsertool.target.name}.jar"/>                  <delete file="${dir.dist}/${browsertool.target.name}.jar"/>
312                  <delete file="${dir.dist}/${tests.target.name}.jar"/>                  <delete file="${dir.dist}/${tests.target.name}.jar"/>
313                  <delete file="${dir.dist}/${tests.guitarget.name}.jnlp"/>                  <delete file="${dir.dist}/${tests.guitarget.name}.jnlp"/>
# Line 358  Line 358 
358                  <!-- create file with jar names -->                  <!-- create file with jar names -->
359                  <echo file="${dir.build}/nl/nikhef/jgridstart/logging/testjars.txt">                  <echo file="${dir.build}/nl/nikhef/jgridstart/logging/testjars.txt">
360                          ${tests.target.name}.jar                          ${tests.target.name}.jar
361                          ${dep.bouncycastle.basename}                          bcprov.jar
362                  </echo>                  </echo>
363                  <!-- and build jars -->                  <!-- and build jars -->
364                  <jar jarfile="${dir.dist}/${tests.guitarget.name}.jar">                  <jar jarfile="${dir.dist}/${tests.guitarget.name}.jar">

Legend:
Removed from v.1348  
changed lines
  Added in v.1349

grid.support@nikhef.nl
ViewVC Help
Powered by ViewVC 1.1.28