|
1 | 1 | <?xml version="1.0" encoding="ISO-8859-1"?> |
2 | | -<project name="strongback" default="dist" xmlns:antcontrib="antlib:net.sf.antcontrib"> |
| 2 | +<project name="strongback" default="dist"> |
3 | 3 | <!-- Add Ant-Contrib --> |
4 | | - <taskdef uri="antlib:net.sf.antcontrib" |
5 | | - resource="net/sf/antcontrib/antlib.xml" |
6 | | - classpath="libs/build/ant-contrib-1.0b3.jar"/> |
| 4 | + <taskdef resource="net/sf/antcontrib/antlib.xml"> |
| 5 | + <classpath> |
| 6 | + <pathelement location="libs/ant/ant-contrib-1.0b3.jar"/> |
| 7 | + </classpath> |
| 8 | + </taskdef> |
7 | 9 |
|
8 | 10 | <import file="dependencies.xml"/> |
9 | 11 | <tstamp> |
|
33 | 35 | <echo>There are a few other targets that are automatically run when the above targets are used,</echo> |
34 | 36 | <echo>but which you may want to run manually:</echo> |
35 | 37 | <echo></echo> |
36 | | - <echo> dep Install the dependencies required to compile, run tests, and create the distribution.</echo> |
37 | | - <echo> remove-dep Remove the dependencies installed by `dep`</echo> |
| 38 | + <echo> deps Install the dependencies required to compile, run tests, and create the distribution.</echo> |
| 39 | + <echo> remove-deps Remove the dependencies installed by `dep`</echo> |
38 | 40 | <echo></echo> |
39 | 41 | </target> |
40 | 42 |
|
|
45 | 47 | </antcall> |
46 | 48 | </target> |
47 | 49 |
|
48 | | - <target name="compile" depends="dep" description="Compiles source code"> |
| 50 | + <target name="compile" depends="deps" description="Compiles source code"> |
49 | 51 | <antcall target="strongback.all"> |
50 | 52 | <param name="dependency.target" value="compile"/> |
51 | 53 | </antcall> |
52 | 54 | </target> |
53 | 55 |
|
54 | | - <target name="test" depends="dep" description="Run the tests"> |
| 56 | + <target name="test" depends="deps" description="Run the tests"> |
55 | 57 | <antcall target="strongback.all"> |
56 | 58 | <param name="dependency.target" value="test"/> |
57 | 59 | </antcall> |
58 | 60 | </target> |
59 | 61 |
|
60 | | - <target name="jar" depends="dep" description="Creates the JARs"> |
| 62 | + <target name="jar" depends="deps" description="Creates the JARs"> |
61 | 63 | <antcall target="strongback.all"> |
62 | 64 | <param name="dependency.target" value="jar"/> |
63 | 65 | </antcall> |
|
137 | 139 | </target> |
138 | 140 |
|
139 | 141 | <!-- Remove and clean dependencies --> |
140 | | - <target name="remove-dep" depends="clean-downloads" description="Removes the locally-installed dependencies"> |
| 142 | + <target name="remove-deps" depends="clean-downloads" description="Removes the locally-installed dependencies"> |
141 | 143 | <!-- !!!! Always remove the *local* installation; never the one in ${wpilib.dir} !!!! --> |
142 | 144 | <delete dir="libs/wpilib" /> |
143 | 145 | </target> |
|
148 | 150 | </target> |
149 | 151 |
|
150 | 152 | <!-- Install Dependencies --> |
151 | | - <target name="dep" depends="download-wpilib,clean-downloads" description="Downloads and installs the dependencies required for the build"> |
| 153 | + <target name="deps" depends="download-wpilib,clean-downloads" description="Downloads and installs the dependencies required for the build"> |
152 | 154 | </target> |
153 | 155 |
|
154 | 156 | <!-- Check if the WPI directory exists --> |
|
167 | 169 | <!-- Download the 'site.xml' file that contains the URL to the feature we want, and get that URL --> |
168 | 170 | <get src="${wpilib.updatesite.url}/site.xml" dest="downloads/site.xml"/> |
169 | 171 | <xmlproperty file="downloads/site.xml" collapseAttributes="true" semanticAttributes="true" keepRoot="true"/> |
170 | | - <antcontrib:for list="${site.feature.url}" param="url"> |
| 172 | + <for list="${site.feature.url}" param="url"> |
171 | 173 | <sequential> |
172 | | - <antcontrib:if> |
| 174 | + <if> |
173 | 175 | <contains string="@{url}" substring="java.feature"/> |
174 | 176 | <then> |
175 | 177 | <property name="javaFeatureUrl" value="@{url}"/> |
176 | 178 | </then> |
177 | | - </antcontrib:if> |
| 179 | + </if> |
178 | 180 | </sequential> |
179 | | - </antcontrib:for> |
180 | | - <antcontrib:propertyregex property="wpilib.version" input="${javaFeatureUrl}" regexp="_([\d.]*).jar" select="\1" casesensitive="false" /> |
| 181 | + </for> |
| 182 | + <propertyregex property="wpilib.version" input="${javaFeatureUrl}" regexp="_([\d.]*).jar" select="\1" casesensitive="false" /> |
181 | 183 | <!-- The feature URL can be converted to the plugin URL --> |
182 | 184 | <loadresource property="javaPluginUrl"> |
183 | 185 | <propertyresource name="javaFeatureUrl"/> |
|
0 commit comments