/[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 554 by wvengen, Thu Jul 16 15:43:50 2009 UTC revision 555 by wvengen, Thu Jul 16 15:59:51 2009 UTC
# Line 59  Line 59 
59          <property name="dep.bouncycastle" location="${dir.thirdparty}/bouncycastle/bcprov-jdk14-143.jar"/>          <property name="dep.bouncycastle" location="${dir.thirdparty}/bouncycastle/bcprov-jdk14-143.jar"/>
60          <property name="dep.bouncycastle.smime" location="${dir.thirdparty}/bouncycastle/bcmail-jdk14-143.jar"/>          <property name="dep.bouncycastle.smime" location="${dir.thirdparty}/bouncycastle/bcmail-jdk14-143.jar"/>
61          <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"/>
         <property name="dep.activation" location="${dir.thirdparty}/bouncycastle/activation.jar"/>  
62          <property name="dep.cli" location="${dir.thirdparty}/commons-cli/commons-cli-1.2.jar"/>          <property name="dep.cli" location="${dir.thirdparty}/commons-cli/commons-cli-1.2.jar"/>
63          <property name="dep.junit" location="${dir.thirdparty}/junit/junit-4.5.jar"/>          <property name="dep.junit" location="${dir.thirdparty}/junit/junit-4.5.jar"/>
64          <property name="dep.abbot" location="${dir.thirdparty}/junit/abbot.jar"/>          <property name="dep.abbot" location="${dir.thirdparty}/junit/abbot.jar"/>
# Line 68  Line 67 
67          <property name="dep.itext" location="${dir.thirdparty}/flyingsaucer/iText-2.0.8.jar"/>          <property name="dep.itext" location="${dir.thirdparty}/flyingsaucer/iText-2.0.8.jar"/>
68          <property name="dep.winregistry" location="${dir.thirdparty}/winregistry/WinRegistry-3.4.jar"/>          <property name="dep.winregistry" location="${dir.thirdparty}/winregistry/WinRegistry-3.4.jar"/>
69          <property name="dep.apiviz" location="${dir.thirdparty}/javadoc/apiviz-1.3.0.GA.jar"/>          <property name="dep.apiviz" location="${dir.thirdparty}/javadoc/apiviz-1.3.0.GA.jar"/>
70            <!-- activation framework is present in Java 1.6 and we don't use
71                 it apart for resolving; so we can omit it when compiling there
72                 to avoid ProGuard Warnings (which are fatal) -->
73            <condition property="dep.activation" value="${dir.thirdparty}/bouncycastle/activation.jar">
74                    <not><available classname="javax.activation.DataHandler"/></not>
75            </condition>
76          <path id="path.dependencies">          <path id="path.dependencies">
77                  <!-- TODO use jdk13 library versions and test -->                  <!-- TODO use jdk13 library versions and test -->
78                  <pathelement location="${dep.bouncycastle}"/>                  <pathelement location="${dep.bouncycastle}"/>
79                  <pathelement location="${dep.bouncycastle.smime}"/>                  <pathelement location="${dep.bouncycastle.smime}"/>
80                          <pathelement location="${dep.javamail}"/>                          <pathelement location="${dep.javamail}"/>
                         <pathelement location="${dep.activation}"/>  
81                  <pathelement location="${dep.cli}"/>                  <pathelement location="${dep.cli}"/>
82                  <pathelement location="${dep.junit}"/>                  <pathelement location="${dep.junit}"/>
83                  <pathelement location="${dep.abbot}"/>                  <pathelement location="${dep.abbot}"/>
# Line 154  Line 158 
158                               package reference javax.mail which we don't want to include as well (so that                               package reference javax.mail which we don't want to include as well (so that
159                               ProGuard can resolve them). Solution: only include part of the smime package.                               ProGuard can resolve them). Solution: only include part of the smime package.
160                               In addition to this, certificate renewal also requires S/MIME mail stuff.                               In addition to this, certificate renewal also requires S/MIME mail stuff.
161                               The activation framework doesn't appear to be needed during run, but ProGuard                               The activation framework doesn't appear to be needed during run -->
                              needs it to resolve its references, so we include it anyway (it's small). -->  
162                          <zipfileset src="${dep.bouncycastle.smime}">                          <zipfileset src="${dep.bouncycastle.smime}">
163                                  <include name="org/bouncycastle/cms/**"/>                                  <include name="org/bouncycastle/cms/**"/>
164                                  <include name="org/bouncycastle/mail/smime/*.class/"/>                                  <include name="org/bouncycastle/mail/smime/*.class/"/>
165                                  <include name="org/bouncycastle/mail/smime/util/*.class/"/>                                  <include name="org/bouncycastle/mail/smime/util/*.class/"/>
166                          </zipfileset>                          </zipfileset>
167                          <zipfileset src="${dep.javamail}" includes="**/*.class"/>                          <zipfileset src="${dep.javamail}" includes="**/*.class"/>
                         <zipfileset src="${dep.activation}" includes="**/*.class"/>  
168                  </jar>                  </jar>
169                  <!-- minimize jar file; skipnonpubliclibraryclasses needed for java1.6 -->                  <!-- minimize jar file; skipnonpubliclibraryclasses needed for java1.6 -->
170                  <proguard obfuscate="false" skipnonpubliclibraryclasses="false">                  <proguard obfuscate="false" skipnonpubliclibraryclasses="false">
# Line 174  Line 176 
176                          <libraryjar file="${dep.bouncycastle}"/>                          <libraryjar file="${dep.bouncycastle}"/>
177                          <libraryjar file="${dep.junit}"/>                          <libraryjar file="${dep.junit}"/>
178                          <libraryjar file="${dep.abbot}"/>                          <libraryjar file="${dep.abbot}"/>
179                            <libraryjar file="${dep.activation}"/>
180                          <keepclasseswithmembers access="public">                          <keepclasseswithmembers access="public">
181                                  <method access="public static" type="void"                                  <method access="public static" type="void"
182                                          name="main" parameters="java.lang.String[]"/>                                          name="main" parameters="java.lang.String[]"/>

Legend:
Removed from v.554  
changed lines
  Added in v.555

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