/[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 556 by wvengen, Thu Jul 16 16:03:39 2009 UTC revision 557 by wvengen, Thu Jul 16 16:34:50 2009 UTC
# Line 69  Line 69 
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          <!-- 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               it apart for resolving; so we can omit it when compiling there
72               to avoid ProGuard Warnings (which are fatal) -->               to avoid ProGuard Warnings (which are fatal); so we need it for
73          <property name="dep.activation.real" location="${dir.thirdparty}/bouncycastle/activation.jar"/>               lower versions. This is a little trick with ProGuard's jarfilter -->
74          <condition property="dep.activation" value="${dep.activation.real}">          <property name="dep.activation" location="${dir.thirdparty}/bouncycastle/activation.jar"/>
75            <condition property="dep.activation.proguardfilter" value="(!**)">
76                  <not><available classname="javax.activation.DataHandler"/></not>                  <not><available classname="javax.activation.DataHandler"/></not>
77          </condition>          </condition>
78          <path id="path.dependencies">          <path id="path.dependencies">
# Line 130  Line 131 
131                          </fileset>                          </fileset>
132                  </copy>                  </copy>
133          </target>          </target>
134            
135          <!--          <!--
136            - Distribution creation target            -  Full JAR creation target
137            -->            -->
138          <target name="dist" depends="compile,keystore">          <target name="jar.large" depends="compile">
                 <!-- pack into jar -->  
139                  <basename property="dep.bouncycastle.basename" file="${dep.bouncycastle}"/>                  <basename property="dep.bouncycastle.basename" file="${dep.bouncycastle}"/>
140                  <jar jarfile="${dir.dist}/${target.name}.large.jar">                  <jar jarfile="${dir.dist}/${target.name}.large.jar">
141                          <manifest>                          <manifest>
# Line 167  Line 167 
167                          </zipfileset>                          </zipfileset>
168                          <zipfileset src="${dep.javamail}" includes="**/*.class"/>                          <zipfileset src="${dep.javamail}" includes="**/*.class"/>
169                  </jar>                  </jar>
170            </target>
171    
172            <!--
173              - Distribution creation target
174              -->
175            <target name="jar" depends="keystore,jar.large">
176                  <!-- minimize jar file; skipnonpubliclibraryclasses needed for java1.6 -->                  <!-- minimize jar file; skipnonpubliclibraryclasses needed for java1.6 -->
177                  <proguard obfuscate="false" skipnonpubliclibraryclasses="false">                  <proguard obfuscate="false" skipnonpubliclibraryclasses="false">
178                          <injar file="${dir.dist}/${target.name}.large.jar"/>                          <injar file="${dir.dist}/${target.name}.large.jar"/>
# Line 177  Line 183 
183                          <libraryjar file="${dep.bouncycastle}"/>                          <libraryjar file="${dep.bouncycastle}"/>
184                          <libraryjar file="${dep.junit}"/>                          <libraryjar file="${dep.junit}"/>
185                          <libraryjar file="${dep.abbot}"/>                          <libraryjar file="${dep.abbot}"/>
186                          <libraryjar file="${dep.activation}"/>                          <libraryjar file="${dep.activation}" jarfilter="${dep.activation.proguardfilter}" />
187                          <keepclasseswithmembers access="public">                          <keepclasseswithmembers access="public">
188                                  <method access="public static" type="void"                                  <method access="public static" type="void"
189                                          name="main" parameters="java.lang.String[]"/>                                          name="main" parameters="java.lang.String[]"/>
# Line 207  Line 213 
213                  <!-- copy bouncycastle jar to deployment area -->                  <!-- copy bouncycastle jar to deployment area -->
214                  <copy file="${dep.bouncycastle}" todir="${dir.dist}"/>                  <copy file="${dep.bouncycastle}" todir="${dir.dist}"/>
215          </target>          </target>
216          <target name="jar" depends="dist"/>          <target name="dist" depends="jar"/>
217    
218          <!--          <!--
219            - Cleaning target            - Cleaning target

Legend:
Removed from v.556  
changed lines
  Added in v.557

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