equal
deleted
inserted
replaced
38 <delete dir="${module.temp.dir}" /> |
38 <delete dir="${module.temp.dir}" /> |
39 </target> |
39 </target> |
40 |
40 |
41 |
41 |
42 <target name="resolve"> |
42 <target name="resolve"> |
43 <mkdir dir="${lib.dir}"/> <!-- not usually necessary, ivy creates the directory IF there are dependencies --> |
43 <mkdir dir="${lib.dir}" /> |
|
44 <mkdir dir="${lib.dir}/zipsafe" /> |
|
45 <mkdir dir="${lib.dir}/zipnotsafe" /> |
|
46 <delete dir="${lib.dir}/zipnotsafe" includes="**/*" /> |
|
47 |
44 <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" /> |
48 <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" /> |
45 |
49 |
46 <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't --> |
50 <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't --> |
47 <ivy:resolve file="${ivy.file}" log="download-only"/> |
51 <ivy:resolve file="${ivy.file}" log="download-only"/> |
48 <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" log="download-only"/> |
52 <ivy:retrieve pattern="${lib.dir}/zipsafe/[artifact].[ext]" type="egg" log="download-only"/> |
|
53 <ivy:retrieve pattern="${lib.dir}/zipsafe/[artifact].[ext]" type="py" log="download-only"/> |
|
54 <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" log="download-only"/> |
49 </target> |
55 </target> |
50 |
56 |
51 |
57 |
52 <target name="report" depends="resolve" description="--> generates a report of dependencies"> |
58 <target name="report" depends="resolve" description="--> generates a report of dependencies"> |
53 <ivy:report todir="${build.dir}"/> |
59 <ivy:report todir="${build.dir}"/> |
189 <formatter type="brief" usefile="false"/> |
195 <formatter type="brief" usefile="false"/> |
190 <formatter type="xml" usefile="true"/> |
196 <formatter type="xml" usefile="true"/> |
191 <jvmarg value="-Demma.coverage.out.file=${module.temp.dir}/coverage_junit.emma" /> |
197 <jvmarg value="-Demma.coverage.out.file=${module.temp.dir}/coverage_junit.emma" /> |
192 <jvmarg value="-Demma.coverage.out.merge=true" /> |
198 <jvmarg value="-Demma.coverage.out.merge=true" /> |
193 <jvmarg value="-Dtestdir=${basedir}" /> |
199 <jvmarg value="-Dtestdir=${basedir}" /> |
|
200 <jvmarg value="-Dtest.temp.dir=${test.temp.dir}" /> |
194 <classpath> |
201 <classpath> |
195 <fileset dir="${module.temp.dir}/backup/"> |
202 <fileset dir="${module.temp.dir}/backup/"> |
196 <include name="**/*.jar"/> |
203 <include name="**/*.jar"/> |
197 </fileset> |
204 </fileset> |
198 <fileset dir="${lib.dir}"> |
205 <fileset dir="${lib.dir}"> |
271 <fileset dir="${module.temp.dir}/backup/" includes="${ant.project.name}.jar" /> |
278 <fileset dir="${module.temp.dir}/backup/" includes="${ant.project.name}.jar" /> |
272 </instrpath> |
279 </instrpath> |
273 </instr> |
280 </instr> |
274 </emma> |
281 </emma> |
275 <pathconvert pathsep="${path.separator}" property="python.path"> |
282 <pathconvert pathsep="${path.separator}" property="python.path"> |
276 <fileset dir="${lib.dir}" includes="**/*.egg"/> |
283 <fileset dir="${lib.dir}" includes="zipsafe/*.egg"/> |
277 <dirset dir="${lib.dir}"/> |
284 <dirset dir="${lib.dir}" includes="zipnotsafe/*.egg"/> |
|
285 <dirset dir="${lib.dir}" includes="zipsafe" /> |
278 </pathconvert> |
286 </pathconvert> |
279 <exec osfamily="windows" executable="cmd" dir="${basedir}/tests" failonerror="true"> |
287 <exec osfamily="windows" executable="cmd" dir="${basedir}/tests" failonerror="true"> |
280 <env key="ANT_ARGS" value="-lib ${lib.dir} -lib ${module.temp.dir}/backup/${ant.project.name}.jar -lib ${builder.dir}/antlibs -Dpython.path=${python.path}" /> |
288 <env key="ANT_ARGS" value="-lib ${lib.dir} -lib ${module.temp.dir}/backup/${ant.project.name}.jar -lib ${builder.dir}/antlibs -Dpython.path=${python.path}" /> |
281 <env key="PYTHONPATH" value="${python.path}" /> |
289 <env key="PYTHONPATH" value="${python.path}" /> |
282 <env key="JYTHONPATH" value="${python.path}" /> |
290 <env key="JYTHONPATH" value="${python.path}" /> |
327 </trycatch> |
335 </trycatch> |
328 </then> |
336 </then> |
329 </if> |
337 </if> |
330 <if> |
338 <if> |
331 <resourcecount count="0" when="gt"> |
339 <resourcecount count="0" when="gt"> |
332 <fileset dir="${build.temp.dir}/" includes="*/*.emma" /> |
340 <fileset dir="${components.temp.dir}/" includes="*/*.emma" /> |
333 </resourcecount> |
341 </resourcecount> |
334 <then> |
342 <then> |
335 <emma enabled="true" verbosity="quiet"> |
343 <emma enabled="true" verbosity="quiet"> |
336 <report sourcepath="${src.dir}"> |
344 <report sourcepath="${src.dir}"> |
337 <infileset dir="${components.temp.dir}/" includes="*/*.emma" /> |
345 <infileset dir="${components.temp.dir}/" includes="*/*.emma" /> |