tjh.dev
1--- a/build.xml 2015-02-04 08:47:37.000000000 +0100
2+++ b/build.xml 2015-02-17 14:06:42.455283148 +0100
3@@ -43,16 +43,6 @@
4 <property name="textAreaPackage"
5 location="../textarea"/>
6
7- <!-- Ivy Properties -->
8- <property name="config.ivy.version"
9- value="2.2.0"/>
10- <property name="ivy.jar.dir"
11- location="${lib.dir}/ivy"/>
12- <property name="ivy.jar.filename"
13- value="ivy-${config.ivy.version}.jar"/>
14- <property name="ivy.jar.file"
15- location="${ivy.jar.dir}/${ivy.jar.filename}"/>
16-
17 <!-- Miscellaneous -->
18 <property name="jar.filename"
19 value="${ant.project.name}.jar"/>
20@@ -90,51 +80,8 @@
21 value="true"/>
22 </target>
23
24- <target name="check-ivy"
25- depends="init">
26- <available property="ivy.jar.present"
27- file="${ivy.jar.file}"
28- type="file"/>
29- </target>
30-
31- <target name="download-ivy"
32- depends="init,check-ivy"
33- unless="ivy.jar.present">
34- <mkdir dir="${ivy.jar.dir}"/>
35- <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${config.ivy.version}/ivy-${config.ivy.version}.jar"
36- dest="${ivy.jar.file}"
37- usetimestamp="true"/>
38- </target>
39-
40- <target name="init-ivy"
41- depends="init,download-ivy"
42- unless="ivy.done">
43- <property name="ivy.retrieve.pattern"
44- value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/>
45- <taskdef resource="org/apache/ivy/ant/antlib.xml"
46- classpath="${ivy.jar.file}"
47- loaderref="ivy.loader"
48- uri="antlib:org.apache.ivy.ant"/>
49- <ivy:settings file="ivysettings.xml"/>
50- </target>
51-
52- <target name="retrieve"
53- description="retrieve the dependencies"
54- depends="init,init-ivy"
55- unless="ivy.done">
56- <ivy:retrieve sync="true"/>
57- <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"
58- organisation="org.apache.ivy"
59- module="ivy"
60- revision="${config.ivy.version}"
61- conf="default"
62- inline="true"/>
63- <property name="ivy.done"
64- value="true"/>
65- </target>
66-
67 <target name="setup"
68- depends="init,retrieve">
69+ depends="init">
70 <taskdef resource="net/sf/antcontrib/antlib.xml"
71 uri="antlib:net.sf.antcontrib">
72 <classpath>
73@@ -239,37 +186,6 @@
74 </javac>
75 </target>
76
77- <target name="compile-test"
78- depends="init,retrieve,compile">
79- <mkdir dir="${classes.dir}/test"/>
80- <depend srcDir="${basedir}/test"
81- destDir="${classes.dir}/test"
82- cache="${classes.dir}"/>
83- <dependset>
84- <srcfilelist files="build.xml"/>
85- <srcfilelist files="ivy.xml"/>
86- <targetfileset dir="${classes.dir}/test"/>
87- </dependset>
88- <javac srcdir="test"
89- destdir="${classes.dir}/test"
90- debug="true"
91- debuglevel="${config.build.debuglevel}"
92- nowarn="${config.build.nowarn}"
93- deprecation="${config.build.deprecation}"
94- source="${target.java.version}"
95- target="${target.java.version}"
96- compiler="modern"
97- encoding="UTF-8"
98- includeAntRuntime="false">
99- <classpath id="classpath.test">
100- <fileset dir="${lib.dir}/test"
101- includes="*.jar"/>
102- <pathelement location="${classes.dir}/core"/>
103- </classpath>
104- <compilerarg line="${config.build.compilerarg}"/>
105- </javac>
106- </target>
107-
108 <target name="prepare-textArea"
109 depends="init">
110 <delete includeemptydirs="true"
111@@ -423,33 +339,8 @@
112 </javac>
113 </target>
114
115- <target name="test"
116- depends="init,retrieve,compile,compile-test"
117- description="run unit tests"
118- unless="skip.tests">
119- <delete dir="${build.dir}/test/raw-reports"/>
120- <mkdir dir="${build.dir}/test/raw-reports"/>
121- <junit printsummary="true"
122- failureproperty="tests.failed"
123- enabletestlistenerevents="true">
124- <classpath refid="classpath.test"/>
125- <classpath location="${classes.dir}/test"/>
126- <formatter type="xml"/>
127- <batchtest todir="${build.dir}/test/raw-reports">
128- <fileset dir="test"/>
129- </batchtest>
130- </junit>
131- <mkdir dir="${build.dir}/test/merged-reports"/>
132- <junitreport todir="${build.dir}/test/merged-reports">
133- <fileset dir="${build.dir}/test/raw-reports"/>
134- <report todir="${build.dir}/test/reports"/>
135- </junitreport>
136- <fail message="Unit test(s) failed! See reports at ${build.dir}/test/reports/index.html"
137- if="tests.failed"/>
138- </target>
139-
140 <target name="build"
141- depends="init,retrieve,setup,compile"
142+ depends="init,setup,compile"
143 description="build the jEdit JAR-file with full debug-information">
144 <mkdir dir="${jar.location}"/>
145 <jar destfile="${jar.location}/${jar.filename}"
146@@ -504,11 +395,10 @@
147 </copy>
148 </contrib:then>
149 </contrib:if>
150- <antcall target="test" />
151 </target>
152
153 <target name="build-exe-launcher"
154- depends="init,retrieve,setup,filter-package-files"
155+ depends="init,setup,filter-package-files"
156 description="build the EXE launcher">
157 <contrib:if>
158 <os family="windows"/>
159@@ -622,7 +512,7 @@
160 </target>
161
162 <target name="unpack-docbook-xsl"
163- depends="init,retrieve">
164+ depends="init">
165 <unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip"
166 dest="${build.dir}/docbook-xsl/"/>
167 </target>
168@@ -668,7 +558,7 @@
169 </presetdef>
170
171 <target name="generate-doc-faq"
172- depends="init,retrieve,setup,unpack-docbook-xsl">
173+ depends="init,setup,unpack-docbook-xsl">
174 <dependset.html>
175 <srcfileset dir="doc/FAQ"/>
176 <targetfileset dir="${jar.location}/doc/FAQ"/>
177@@ -692,7 +582,7 @@
178 </target>
179
180 <target name="generate-doc-news"
181- depends="init,retrieve,setup,unpack-docbook-xsl">
182+ depends="init,setup,unpack-docbook-xsl">
183 <dependset.html>
184 <srcfileset dir="doc/whatsnew"/>
185 <targetfileset dir="${jar.location}/doc/whatsnew"/>
186@@ -716,7 +606,7 @@
187 </target>
188
189 <target name="generate-doc-users-guide"
190- depends="init,retrieve,setup,unpack-docbook-xsl">
191+ depends="init,setup,unpack-docbook-xsl">
192 <dependset.html>
193 <srcfileset dir="doc/users-guide"/>
194 <targetfileset dir="${jar.location}/doc/users-guide"/>
195@@ -851,7 +741,7 @@
196 </target>
197
198 <target name="generate-pdf-users-guide"
199- depends="init,retrieve,setup,unpack-docbook-xsl">
200+ depends="init,setup,unpack-docbook-xsl">
201 <fail message="Please set the property "paper.type""
202 unless="paper.type"/>
203 <contrib:switch value="${paper.type}">
204@@ -1154,7 +1044,7 @@
205 </target>
206
207 <target name="compile-jarbundler"
208- depends="init,retrieve">
209+ depends="init">
210 <mkdir dir="${classes.dir}/jarbundler"/>
211 <depend srcDir="${basedir}"
212 destDir="${classes.dir}/jarbundler"
213@@ -1180,7 +1070,7 @@
214 </target>
215
216 <target name="dist-mac-finish"
217- depends="init,retrieve,setup"
218+ depends="init,setup"
219 description="finish building the Mac OS X disk image (DMG-file) on Mac OS X">
220 <fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently">
221 <condition>
222@@ -1295,7 +1185,7 @@
223 </target>
224
225 <target name="dist-mac"
226- depends="init,retrieve,setup,prepare-dist-files"
227+ depends="init,setup,prepare-dist-files"
228 description="build the Mac OS X disk image (DMG-file)">
229 <antcall target="compile-jarbundler">
230 <param name="config.build.debuglevel"
231@@ -1411,7 +1301,7 @@
232 </target>
233
234 <target name="prepare-dist-files"
235- depends="init,retrieve,setup">
236+ depends="init,setup">
237 <antcall target="build">
238 <param name="config.build.debuglevel"
239 value="lines,source"/>
240@@ -1592,7 +1482,7 @@
241 </target>
242
243 <target name="dist-deb"
244- depends="init,retrieve,setup,prepare-dist-files"
245+ depends="init,setup,prepare-dist-files"
246 description="build the DEB Package">
247 <antcall target="compile-ar">
248 <param name="config.build.debuglevel"
249@@ -1838,7 +1728,7 @@
250 </target>
251
252 <target name="dist-sign-deb-Release"
253- depends="init,retrieve,setup"
254+ depends="init,setup"
255 description="sign the DEB Release file">
256 <contrib:if>
257 <not>