/[pdpsoft]/trunk/nl.nikhef.slcshttps/build.xml
ViewVC logotype

Diff of /trunk/nl.nikhef.slcshttps/build.xml

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

revision 1220 by msalle, Thu Nov 19 21:55:55 2009 UTC revision 1221 by msalle, Wed Dec 2 21:34:10 2009 UTC
# Line 16  Line 16 
16      <property name="package"             value="nl/nikhef/slcshttps"/>      <property name="package"             value="nl/nikhef/slcshttps"/>
17      <property name="packagename"         value="nl.nikhef.slcshttps"/>      <property name="packagename"         value="nl.nikhef.slcshttps"/>
18    
     
19      <!-- Set short version for the above java version -->      <!-- Set short version for the above java version -->
     <condition property="javashort" value="14">  
         <equals arg1="${javaversion}" arg2="1.4"/>  
     </condition>  
20      <condition property="javashort" value="15">      <condition property="javashort" value="15">
21          <equals arg1="${javaversion}" arg2="1.5"/>          <equals arg1="${javaversion}" arg2="1.5"/>
22      </condition>      </condition>
# Line 29  Line 25 
25      </condition>      </condition>
26    
27      <!-- Set BouncyCastle provider -->      <!-- Set BouncyCastle provider -->
     <!-- property name="bcprov" value="extern/bcprov-jdk${javashort}-143.jar"/-->  
28      <property name="bcprov" value="extern/bcprov-jdk${javashort}-144.jar"/>      <property name="bcprov" value="extern/bcprov-jdk${javashort}-144.jar"/>
29    
30      <!-- jarfile name contains the JVM short version -->      <!-- jarfile name contains the JVM short version -->
31      <property name="jar" value="${ant.project.name}_jdk${javashort}_v${version}.jar"/>      <property name="jar" value="${ant.project.name}_jdk${javashort}_v${version}.jar"/>
32    
33      <!-- Set the correct BareBonesBrowserLaunch.java file to copy to the real one -->      <!-- Set property for link to external documentation -->
34      <property name="BBBLdir" value="src/${package}/util/"/>      <condition property="apiLink"
35      <!-- Note: both 1.5 and 1.6 use the .15 file -->          value="http://java.sun.com/j2se/1.5.0/docs/api"
36      <condition property="BBBL"          else= "http://java.sun.com/javase/6/docs/api/">
37          value="${BBBLdir}BareBonesBrowserLaunch.java.14"          <equals arg1="${javaversion}" arg2="1.5"/>
         else= "${BBBLdir}BareBonesBrowserLaunch.java.15">  
         <equals arg1="${javaversion}" arg2="1.4"/>  
38      </condition>      </condition>
39    
40      <!--      <!--
# Line 52  Line 45 
45      </path>      </path>
46    
47      <!--      <!--
      !   task to copy the correct browser java file  
     -->  
     <target name="updateBBBL">  
         <copy  
             file="${BBBL}" tofile="${BBBLdir}BareBonesBrowserLaunch.java"  
             overwrite="true" preservelastmodified="true" verbose="true" />  
     </target>  
   
     <!--  
48       !   Release generation       !   Release generation
49      -->      -->
50      <target name="release" depends="build,javadoc">      <target name="release" depends="build,javadoc">
# Line 114  Line 98 
98                     destdir="${doc}"                     destdir="${doc}"
99                     private="true"                     private="true"
100                     version="true"                     version="true"
101                       link="${apiLink}"
102                     windowtitle="${ant.project.name}">                     windowtitle="${ant.project.name}">
103          <classpath>          <classpath>
104             <pathelement location="${bcprov}"/>             <pathelement location="${bcprov}"/>

Legend:
Removed from v.1220  
changed lines
  Added in v.1221

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