ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.99 by jsr166, Sat Jan 19 01:37:44 2013 UTC vs.
Revision 1.100 by jsr166, Sat Jan 19 17:15:44 2013 UTC

# Line 167 | Line 167
167      <pathelement location="${build.loops.dir}"/>
168    </path>
169  
170 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
171 +  <!-- TODO: How do we get &trade to work? -->
172 +  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
173 +  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
174 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
175  
176    <!-- Main targets -->
177  
# Line 175 | Line 180
180            description="Builds all public jars and docs"/>
181  
182    <target name="compile"
183 <          depends="init, configure-compiler"
184 <          description="Compiles main sources to build folder">
183 >          depends="configure-compiler"
184 >          description="Compiles src/main sources to build folder">
185  
186      <mkdir dir="${build.classes.dir}"/>
187  
188      <javac srcdir="${src.dir}"
189 <          destdir="${build.classes.dir}"
190 <            debug="${build.debug}"
191 <       debuglevel="${build.debuglevel}"
192 <      deprecation="${build.deprecation}"
193 <           source="${build.sourcelevel}"
194 <             fork="true">
189 >           destdir="${build.classes.dir}"
190 >           debug="${build.debug}"
191 >           debuglevel="${build.debuglevel}"
192 >           deprecation="${build.deprecation}"
193 >           classpath=""
194 >           includeAntRuntime="false"
195 >           includeJavaRuntime="false"
196 >           executable="${javac8}"
197 >           fork="true">
198  
199        <include name="**/*.java"/>
200 +      <compilerarg line="${build.args}"/>
201        <compilerarg value="-XDignore.symbol.file=true"/>
202 +      <compilerarg value="-Xlint:all"/>
203  
204   <!--
205        <exclude name="java/lang/**"/>
# Line 224 | Line 234
234  
235  
236    <target name="docs"
237 <          description="Builds javadocs with custom tags to build folder">
237 >          description="Builds javadocs for src/main">
238  
239 <    <delete dir="${build.javadocs.dir}"/>
240 <    <mkdir dir="${build.javadocs.dir}"/>
239 >    <delete dir="${dist.javadocs.dir}"/>
240 >    <mkdir dir="${dist.javadocs.dir}"/>
241  
242      <!-- the packagenames="none" hack below prevents scanning the -->
243      <!-- sourcepath for packages -->
244  
245 <    <javadoc destdir="${build.javadocs.dir}"
245 >    <javadoc destdir="${dist.javadocs.dir}"
246               packagenames="none"
247 <             link="${jdkapidocs.url}"
247 >             link="${jdkapi8docs.url}"
248               overview="${src.dir}/intro.html"
249 <             sourcepath="${src.dir}:${jdksrc.dir}"
250 <             additionalparam="-XDignore.symbol.file=true" >
249 >             sourcepath="${src.dir}:${jdk8src.dir}"
250 >             classpath=""
251 >             executable="${javadoc8}">
252 >      <arg value="-XDignore.symbol.file=true"/>
253 >      <arg value="-tag"/>
254 >      <arg value="${javadoc.jls.option}"/>
255        <fileset dir="${src.dir}" defaultexcludes="yes">
256          <include name="**/*.java"/>
257        </fileset>
# Line 248 | Line 262
262  
263  
264    <target name="dist"
265 <          depends="init, dist-clean, dist-jar, dist-docs"
265 >          depends="init, dist-clean, dist-jar, docs"
266            description="Puts all distributable products in single hierarchy"/>
267  
268  
# Line 290 | Line 304
304  
305    </target>
306  
293
294
295  <target name="dist-docs"
296          description="Builds javadocs without custom tags to dist folder">
297
298    <delete dir="${dist.javadocs.dir}"/>
299    <mkdir dir="${dist.javadocs.dir}"/>
300
301    <!-- the packagenames="none" hack below prevents scanning the -->
302    <!-- sourcepath for packages -->
303
304    <javadoc destdir="${dist.javadocs.dir}"
305             packagenames="none"
306             link="${jdkapidocs.url}"
307             overview="${src.dir}/intro.html"
308             sourcepath="${src.dir}:${jdksrc.dir}"
309             additionalparam="-XDignore.symbol.file=true" >
310      <fileset dir="${src.dir}" defaultexcludes="yes">
311        <include name="**/*.java"/>
312      </fileset>
313    </javadoc>
314
315  </target>
316
307  
308  
309    <!-- Internal targets -->

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines