← Back to branch summary

~ubuntu-branches/ubuntu/raring/testng/raring

« back to all changes in this revision

Viewing changes to build.xml

  • Committer: Bazaar Package Importer
  • Author(s): Marcus Better
  • Date: 2010-04-25 09:42:04 UTC
  • mfrom: (1.1.2 upstream) (2.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100425094204-rg6mw229trcyyd63
http://bugs.debian.org/538708
http://bugs.debian.org/577477
* New upstream version.
* Switch to source format 3.0 (quilt). Thanks to Raphael
  Hertzog. (Closes: #538708)
* Disable tests that fail with qdox 1.11. Thanks to Daniel Schepler
  (Closes: #577477).
* debian/control: Bump standards-version (no changed needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
build.xml
134
134
 
135
135
    <javac classpathref="compile2.cp"
136
136
           verbose="false"
 
137
           source="1.5"
137
138
           target="1.5"
138
139
           debug="true"
139
140
           optimize="${optimize}"
151
152
 
152
153
  <target name="test-15" depends="compile-15" description="runs all JDK5 tests with JDK5 distro">
153
154
        <ant inheritall="no" antfile="test/build.xml" />
 
155
<!--
154
156
        <ant inheritall="no" antfile="test/v4/build.xml" />
 
157
-->
155
158
  </target>
156
159
        
157
160
  <target name="test-15-jdk14" depends="compile-15,compile-14" description="runs javadoc-tests with JDK5 distro">
163
166
        
164
167
  <target name="test-14" depends="compile-14" description="runs javadoc-based tests with JDK1.4 distro">
165
168
    <ant inheritall="no" antfile="test-14/build.xml" />
 
169
<!--
166
170
    <ant inheritall="no" antfile="test-14/v4/build.xml" />
 
171
-->
167
172
  </target>
168
173
 
169
174
        <!--
203
208
 
204
209
  <target name="dist-jar" depends="dist-14,dist-15" />
205
210
 
206
 
  <target name="dist-14" depends="compile-14,dist-14-bsh" >
 
211
  <target name="dist-14" depends="compile-14,dist-14-no3rdparty" >
207
212
   </target>
208
213
 
209
214
  <target name="dist-14-bsh">
223
228
    </jar>
224
229
  </target>
225
230
  
226
 
  <target name="dist-14-nobsh">
227
 
    <antcall target="clean-unjar" />
228
 
    <antcall target="extract-concurrent-jar" />
229
 
    <jar destfile="${other.jars.dir}/${jdk14.testng.nobsh.jar}" update="true">
 
231
  <target name="dist-14-no3rdparty">
 
232
    <delete quiet="true" file="${jdk14.testng.jar}" />
 
233
    <jar destfile="${jdk14.testng.jar}">
230
234
      <manifest>
231
235
        <attribute name="Main-Class" value="org.testng.TestNG" />
232
236
        <attribute name="Implementation-Version" value="${testng.version}-${DSTAMP}${TSTAMP}" />
233
237
      </manifest>
234
 
      <fileset dir="${build.3rdparty.dir}" />
235
238
      <fileset dir="${build.jdk14.dir}" />
236
239
      <fileset file="TESTNG-${testng.version}" />
237
240
    </jar>
260
263
           overwrite="true" />
261
264
  </target>
262
265
 
263
 
  <target name="dist-15" depends="compile-15, dist-15-bsh">
 
266
  <target name="dist-15" depends="compile-15, dist-15-no3rdparty">
264
267
  </target>
265
268
    
266
269
  <target name="dist-15-bsh">
279
282
    </jar>
280
283
  </target>
281
284
  
282
 
  <target name="dist-15-nobsh">
283
 
    <antcall target="clean-unjar" />
284
 
    <antcall target="extract-qdox-jar" />
285
 
    <jar destfile="${other.jars.dir}/${jdk15.testng.nobsh.jar}" update="true">
 
285
  <target name="dist-15-no3rdparty">
 
286
    <delete quiet="true" file="${jdk15.testng.jar}" />
 
287
    <jar destfile="${jdk15.testng.jar}">
286
288
      <manifest>
287
289
        <attribute name="Main-Class" value="org.testng.TestNG" />
288
290
        <attribute name="Implementation-Version" value="${testng.version}-${DSTAMP}${TSTAMP}" />
289
291
      </manifest>
290
292
      <fileset dir="${build.jdk15.dir}" />
291
 
      <fileset dir="${build.3rdparty.dir}" />
292
293
      <fileset file="TESTNG-${testng.version}" />
293
294
    </jar>
294
295
  </target>
317
318
                  prefix="${zip.dir}/test-14"
318
319
                  includes="**/*.properties,**/*.java,build.xml,testng.xml"
319
320
                  excludes="test-output/**,report/**,v4/**" />
320
 
      <zipfileset dir="3rdparty"
321
 
                  prefix="${zip.dir}/3rdparty"
322
 
                  includes="${qdox.jar},${beanshell.jar},${concurrent.jar}" />
323
321
    </zip>
324
322
  </target>
325
323