equal
deleted
inserted
replaced
49 <property name="ivy.filename" value="ivy-2.0.0-beta2.jar" /> |
49 <property name="ivy.filename" value="ivy-2.0.0-beta2.jar" /> |
50 <!-- Location of ivy jar. |
50 <!-- Location of ivy jar. |
51 @type string |
51 @type string |
52 @scope private |
52 @scope private |
53 --> |
53 --> |
54 <property name="ivy.file" value="${helium.dir}/external/antlibs/${ivy.filename}" /> |
54 <property name="ivy.file" value="${helium.dir}/external/antlibs2/${ivy.filename}" /> |
55 <available file="${ivy.file}" property="ivy.file.present" /> |
55 <available file="${ivy.file}" property="ivy.file.present" /> |
56 |
56 |
57 <!-- Download ivy jar --> |
57 <!-- Download ivy jar --> |
58 <target name="get-ivy" unless="ivy.file.present" depends="proxy"> |
58 <target name="get-ivy" unless="ivy.file.present" depends="proxy"> |
59 <mkdir dir="${helium.dir}/external/antlibs" /> |
59 <mkdir dir="${helium.dir}/external/antlibs2" /> |
60 <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/ivy/ivy/2.0.0-beta2/${ivy.filename}" dest="${ivy.file}" /> |
60 <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/ivy/ivy/2.0.0-beta2/${ivy.filename}" dest="${ivy.file}" /> |
61 </target> |
61 </target> |
62 |
62 |
63 <!-- Install CruiseControl if not already installed --> |
63 <!-- Install CruiseControl if not already installed --> |
64 <target name="install-cruisecontrol" unless="env.HLM_SUBCON"> |
64 <target name="install-cruisecontrol" unless="env.HLM_SUBCON"> |
86 |
86 |
87 |
87 |
88 <!-- Set libs for bootstrap --> |
88 <!-- Set libs for bootstrap --> |
89 <target name="set-libs"> |
89 <target name="set-libs"> |
90 <path id="lib.path"> |
90 <path id="lib.path"> |
91 <fileset dir="${helium.dir}/external/antlibs" includes="**/*.jar" /> |
91 <fileset dir="${helium.dir}/external/antlibs2" includes="**/*.jar" /> |
92 </path> |
92 </path> |
93 |
93 |
94 <!-- External tasks. --> |
94 <!-- External tasks. --> |
95 <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="lib.path" /> |
95 <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="lib.path" /> |
96 </target> |
96 </target> |
101 <ivy:cleancache /> |
101 <ivy:cleancache /> |
102 </target> |
102 </target> |
103 |
103 |
104 <!-- unzip jars. @scope private--> |
104 <!-- unzip jars. @scope private--> |
105 <target name="unzip-jar"> |
105 <target name="unzip-jar"> |
106 <unzip src="${artifact.file}" dest="${helium.dir}/external/antlibs" /> |
106 <unzip src="${artifact.file}" dest="${helium.dir}/external/antlibs2" /> |
107 </target> |
107 </target> |
108 <!-- unzip eggs. @scope private --> |
108 <!-- unzip eggs. @scope private --> |
109 <target name="unzip-egg"> |
109 <target name="unzip-egg"> |
110 <unzip src="${artifact.file}" dest="${helium.dir}/external/python/lib/2.5" /> |
110 <unzip src="${artifact.file}" dest="${helium.dir}/external/python/lib/2.5" /> |
111 </target> |
111 </target> |
123 <!-- Install libraries main target --> |
123 <!-- Install libraries main target --> |
124 <target name="install-dependencies" depends="proxy,set-libs"> |
124 <target name="install-dependencies" depends="proxy,set-libs"> |
125 <ivy:configure file="${tools.ivy.config.file}" /> |
125 <ivy:configure file="${tools.ivy.config.file}" /> |
126 <ivy:resolve file="${helium.dir}/config/ivy/ivy.xml" conf="${build.type}" haltonfailure="false" /> |
126 <ivy:resolve file="${helium.dir}/config/ivy/ivy.xml" conf="${build.type}" haltonfailure="false" /> |
127 |
127 |
128 <ivy:retrieve pattern="${helium.dir}/external/antlibs/[artifact]-[revision].[ext]" type="jar" /> |
128 <ivy:retrieve pattern="${helium.dir}/external/antlibs2/[artifact]-[revision].[ext]" type="jar" /> |
129 <ivy:retrieve pattern="${helium.dir}/external/python/lib/2.5/[artifact]-[revision].[ext]" type="egg" /> |
129 <ivy:retrieve pattern="${helium.dir}/external/python/lib/2.5/[artifact]-[revision].[ext]" type="egg" /> |
130 <ivy:retrieve pattern="${helium.dir}/external/sources/[artifact]-[revision].[ext]" type="zip" /> |
130 <ivy:retrieve pattern="${helium.dir}/external/sources/[artifact]-[revision].[ext]" type="zip" /> |
131 |
131 |
132 <delete> |
132 <delete> |
133 <fileset dir="${helium.dir}/external/antlibs" includes="ant-optional*.jar" /> |
133 <fileset dir="${helium.dir}/external/antlibs2" includes="ant-optional*.jar" /> |
134 <fileset dir="${helium.dir}/external/antlibs" includes="ant-1.5.jar" /> |
134 <fileset dir="${helium.dir}/external/antlibs2" includes="ant-1.5.jar" /> |
135 </delete> |
135 </delete> |
136 |
136 |
137 <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="lib.path" /> |
137 <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="lib.path" /> |
138 |
138 |
139 <if> |
139 <if> |