Remove hard-coded dependency to lib.path
authorTony Butler <tony.butler@nokia.com>
Fri, 04 Jun 2010 15:05:10 +0100
changeset 1056 0d7b12764c40
parent 1055 d3c5525768c5
child 1057 1302574aca03
Remove hard-coded dependency to lib.path
build.xml
--- a/build.xml	Thu Jun 03 14:37:20 2010 +0100
+++ b/build.xml	Fri Jun 04 15:05:10 2010 +0100
@@ -14,12 +14,11 @@
   <target name="check-env-arm-license"/>
   <target name="get-arm-license"/>
   <target name="set-arm-version"/>
-  
+
+  <!-- import helium task definitions to allow usage of ant-contrib tasks -->
+  <import file="${helium.dir}/helium_preinclude.ant.xml"/>
+   
   <!-- set sf.spec.job.name and sf.spec.job.codeline if they are not specified in the project's job_props.ant.xml -->
-  <path id="lib.path">
-    <fileset dir="${helium.dir}/external/antlibs" includes="**/*.jar"/>
-  </path>
-  <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="lib.path"/>
   <propertyregex override="yes" property="jobname" input="${sf.subproject.path}" regexp=".*[\\/]([^\\^/]+)" replace="\1"/>
   <property name="jobname" value="${sf.subproject.path}"/>
   <propertyregex override="yes" property="codeline" input="${sf.subproject.path}" regexp="^([^\\^/]+)[\\/].*" replace="\1"/>