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.101 by jsr166, Sat Jan 19 17:30:36 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 +  <!-- TODO: Why isn't @jls a "standard" tag? -->
173 +  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174 +  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176  
177    <!-- Main targets -->
178  
# Line 175 | Line 181
181            description="Builds all public jars and docs"/>
182  
183    <target name="compile"
184 <          depends="init, configure-compiler"
185 <          description="Compiles main sources to build folder">
184 >          depends="configure-compiler"
185 >          description="Compiles src/main sources to build folder">
186  
187      <mkdir dir="${build.classes.dir}"/>
188  
189      <javac srcdir="${src.dir}"
190 <          destdir="${build.classes.dir}"
191 <            debug="${build.debug}"
192 <       debuglevel="${build.debuglevel}"
193 <      deprecation="${build.deprecation}"
194 <           source="${build.sourcelevel}"
195 <             fork="true">
190 >           destdir="${build.classes.dir}"
191 >           debug="${build.debug}"
192 >           debuglevel="${build.debuglevel}"
193 >           deprecation="${build.deprecation}"
194 >           classpath=""
195 >           includeAntRuntime="false"
196 >           includeJavaRuntime="false"
197 >           executable="${javac8}"
198 >           fork="true">
199  
200        <include name="**/*.java"/>
201 +      <compilerarg line="${build.args}"/>
202        <compilerarg value="-XDignore.symbol.file=true"/>
203 +      <compilerarg value="-Xlint:all"/>
204  
205   <!--
206        <exclude name="java/lang/**"/>
# Line 224 | Line 235
235  
236  
237    <target name="docs"
238 <          description="Builds javadocs with custom tags to build folder">
238 >          description="Builds javadocs for src/main">
239  
240 <    <delete dir="${build.javadocs.dir}"/>
241 <    <mkdir dir="${build.javadocs.dir}"/>
240 >    <delete dir="${dist.javadocs.dir}"/>
241 >    <mkdir dir="${dist.javadocs.dir}"/>
242  
243      <!-- the packagenames="none" hack below prevents scanning the -->
244      <!-- sourcepath for packages -->
245  
246 <    <javadoc destdir="${build.javadocs.dir}"
246 >    <javadoc destdir="${dist.javadocs.dir}"
247               packagenames="none"
248 <             link="${jdkapidocs.url}"
248 >             link="${jdkapi8docs.url}"
249               overview="${src.dir}/intro.html"
250 <             sourcepath="${src.dir}:${jdksrc.dir}"
251 <             additionalparam="-XDignore.symbol.file=true" >
250 >             sourcepath="${src.dir}:${jdk8src.dir}"
251 >             classpath=""
252 >             executable="${javadoc8}">
253 >      <arg value="-XDignore.symbol.file=true"/>
254 >      <arg value="-tag"/>
255 >      <arg value="${javadoc.jls.option}"/>
256        <fileset dir="${src.dir}" defaultexcludes="yes">
257          <include name="**/*.java"/>
258        </fileset>
# Line 248 | Line 263
263  
264  
265    <target name="dist"
266 <          depends="init, dist-clean, dist-jar, dist-docs"
266 >          depends="init, dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>
268  
269  
# Line 290 | Line 305
305  
306    </target>
307  
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
308  
309  
310    <!-- Internal targets -->

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines