ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.232 by jsr166, Wed Feb 1 18:26:31 2017 UTC vs.
Revision 1.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC

#	Line 18 | Line 18
18		itself.  Because the JDK version matters and because different
19		targets require different JDKs, we assume that users have created a
20		hierarchy containing:
21	–	$HOME/jdk/jdk7
21		$HOME/jdk/jdk8
22		$HOME/jdk/jdk9
23		$HOME/jdk/jdk10
24	+	$HOME/jdk/jdk11
25		where each of the above is a JDK or a symlink to same, and
26	–	$HOME/jdk/src/jdk7
26		$HOME/jdk/src/jdk8
27		$HOME/jdk/src/jdk9
28		$HOME/jdk/src/jdk10
29	+	$HOME/jdk/src/jdk11
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) or a symlink to same.
32
33		Alternatively, define ant variables thus:
34		ant -Djdk$N.home=... -Djdk$N.src.home=...
35	<	for $N in 7 8 9 10 ...
35	>	for $N in 8 9 10 ...
36
37		As of 2016-03, the sources in src/main are for jdk9+ only.
38		------------------------------------------------------------------------------
#	Line 134 | Line 134
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136		<defjdklocations v="10"/>
137	+	<defjdklocations v="11"/>
138
139		<!-- Source locations -->
140		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 144 | Line 145
145		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150		<property name="lib.dir"              location="${basedir}/lib"/>
151		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 183 | Line 185
185		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186
187		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
189	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
190	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
191	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
192	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
193	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
194	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
188	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
189	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194	>	<!-- The location of jdk9 early access docs (RIP) -->
195	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196		<!-- Default jdk doc location (latest stable release seems best) -->
197	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
197	>	<property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198	>	<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
200
201		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 204
204		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
210
211		<!-- Define the "jtreg" task -->
#	Line 234 | Line 241
241		<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242		</condition>
243
244	+	<local name="use-doclint"/>
245	+	<condition property="use-doclint">
246	+	<not> <equals arg1="@{target}" arg2="7"/> </not>
247	+	</condition>
248	+
249		<mkdir dir="@{workdir}/tck-classes"/>
250
251		<javac srcdir="@{tck.src.dir}"
#	Line 253 | Line 265
265		<include name="*.java"/>
266		<compilerarg value="-XDignore.symbol.file=true"/>
267		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
268	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
269		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
270	<	<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
270	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
271		<compilerarg line="${build.args}"/>
272		<javac-elements/>
273
#	Line 265 | Line 278
278		jvm="${java@{target}}"
279		fork="true">
280		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281	<	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
282	<	<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283	<	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284	<	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285	<	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286	<	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
281	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
287		<jvmarg line="@{jvmflags}"/>
288		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
289		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 292 | Line 305
305		</macrodef>
306
307		<!-- Define jtreg test sets for different jdk versions -->
308	+	<fileset dir="${jtreg11.src.dir}">
309	+	<patternset id="jdk11.jtreg.tests">
310	+	<include name="**/*.java"/>
311	+	</patternset>
312	+	</fileset>
313	+
314	+	<fileset dir="${jtreg10.src.dir}">
315	+	<patternset id="jdk10.jtreg.tests">
316	+	<include name="**/*.java"/>
317	+	</patternset>
318	+	</fileset>
319	+
320		<fileset dir="${jtreg9.src.dir}">
321		<patternset id="jdk9.jtreg.tests">
322		<include name="**/*.java"/>
#	Line 315 | Line 340
340
341		<macrodef name="run-jtreg-tests">
342		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
318	–	<attribute name="source" default="7"/>
343		<attribute name="target"/>
344		<attribute name="workdir"/>
345		<attribute name="classes"/>
346	+	<attribute name="verbose" default="${jtreg.verbose}"/>
347		<attribute name="jtregflags" default=""/>
348	+	<element name="jtreg-elements" optional="true"/>
349
350		<sequential>
351
#	Line 337 | Line 363
363		workDir="@{workdir}/JTwork">
364		<patternset refid="jdk@{target}.jtreg.tests"/>
365		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368		<arg value="-agentvm"/>
369		<arg value="-noreport"/>
370	<	<arg value="-verbose:${jtreg.verbose}"/>
370	>	<arg value="-verbose:@{verbose}"/>
371		<arg value="-vmoptions:-esa -ea"/>
372		<arg value="-automatic"/>
373		<arg value="-k:!ignore"/>
374		<arg line="@{jtregflags}"/>
375		<arg line="${jtreg.flags}"/>
376	+	<jtreg-elements/>
377		</jtreg>
378		</sequential>
379		</macrodef>
#	Line 363 | Line 390
390		<!-- Main targets -->
391
392		<property name="build.main.java.version" value="9"/>
393	<	<property name="build.main.javac" value="${javac9}"/>
393	>	<!-- Workaround "no nested properties in ant" -->
394	>	<macrodef name="define-build-main-properties">
395	>	<attribute name="v"/>
396	>	<sequential>
397	>	<property name="build.main.java"    value="${java@{v}}"/>
398	>	<property name="build.main.javac"   value="${javac@{v}}"/>
399	>	<!-- Force javadoc version to be at least 10,
400	>	so we can use override-methods=summary -->
401	>	<condition property="build.main.javadoc"
402	>	value="${javadoc10}"
403	>	else="${javadoc@{v}}">
404	>	<equals arg1="@{v}" arg2="9"/>
405	>	</condition>
406	>	</sequential>
407	>	</macrodef>
408	>	<define-build-main-properties v="${build.main.java.version}"/>
409
410		<target name="dists"
411	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
411	>	depends="dist, 4jdk8dist"
412		description="Builds all public jars and docs"/>
413	+	<!--
414	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415	+	-->
416
417		<target name="compile"
418		depends="configure-compiler"
419		description="Compiles src/main sources to build dir">
420
376	–	<local name="modules"/>
377	–	<condition property="modules">
378	–	<and>
379	–	<available file="${jdk9.home}/jmods" type="dir"/>
380	–	<equals arg1="9" arg2="${build.main.java.version}"/>
381	–	</and>
382	–	</condition>
383	–
421		<local name="destdir"/>
422	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
422	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
423
424		<mkdir dir="${destdir}"/>
425
#	Line 400 | Line 436
436		fork="true">
437
438		<include name="**/*.java"/>
439	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
439	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
440		<compilerarg value="-Xprefer:source"/>
441		<compilerarg value="-XDignore.symbol.file=true"/>
442		<compilerarg value="-Xlint:all"/>
443	+	<compilerarg line="--doclint-format html5"/>
444	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
445		<compilerarg value="-Werror"/>
408	–	<compilerarg value="-Xdoclint:all/protected"/>
446		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447		<compilerarg line="${build.args}"/>
448
#	Line 449 | Line 486
486		access="${build.javadoc.access}"
487		sourcepath="${src.dir}"
488		classpath=""
489	<	executable="${javadoc9}">
489	>	source="9"
490	>	executable="${build.main.javadoc}">
491		<fileset dir="${src.dir}" defaultexcludes="yes">
492		<include name="**/*.java"/>
493		</fileset>
494		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
495		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496		<arg value="-XDignore.symbol.file=true"/>
497	<	<arg value="-Xmodule:java.base"/>
498	<	<arg value="-tag"/>
499	<	<arg value="${javadoc.jls.option}"/>
500	<	<!-- @apiNote currently unused -->
501	<	<!--       <arg value="-tag"/> -->
502	<	<!--       <arg value="apiNote:a:API Note:"/> -->
503	<	<arg value="-tag"/>
504	<	<arg value="implSpec:a:Implementation Requirements:"/>
467	<	<arg value="-tag"/>
468	<	<arg value="implNote:a:Implementation Note:"/>
497	>	<arg value="-html5"/>
498	>	<arg value="--patch-module=java.base=${src.dir}"/>
499	>	<arg value="--override-methods=summary"/>
500	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503	>	<!-- @apiNote tag currently unused -->
504	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
505		<!-- tags added in jdk9: currently unused -->
506	<	<!--       <arg value="-tag"/> -->
507	<	<!--       <arg value="revised:X"/> -->
472	<	<!--       <arg value="-tag"/> -->
473	<	<!--       <arg value="spec:X"/> -->
506	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
508		</javadoc>
509		</target>
510
#	Line 504 | Line 538
538
539		<target name="clean"
540		description="Removes all build products">
507	–
541		<delete dir="${build.dir}"/>
509	–
542		</target>
543
544
545		<target name="dist-clean"
546		description="Removes all build and distribution products">
515	–
547		<delete dir="${build.dir}"/>
548		<delete dir="${dist.dir}"/>
518	–
549		</target>
550
551
#	Line 536 | Line 566
566		<run-tck-tests
567		target="${build.main.java.version}"
568		workdir="${build.dir}"
569	<	classes="${product.jar}"/>
569	>	classes="${product.jar}">
570	>	<javac-elements>
571	>	<compilerarg value="-Werror"/>
572	>	</javac-elements>
573	>	</run-tck-tests>
574		</target>
575
576		<target name="tck-parallelism-1"
#	Line 571 | Line 605
605
606		<target name="test"
607		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
608	<	description="Runs tck and jtreg tests for src/main">
575	<	</target>
608	>	description="Runs tck and jtreg tests for src/main"/>
609
610		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
611
#	Line 583 | Line 616
616
617		<!--   </target> -->
618
619	<	<!--   <target name="test89" -->
620	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
619	>	<target name="test91011"
620	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
621
622	<	<!--     <antcall target="clean"/> -->
623	<	<!--     <antcall target="test"> -->
624	<	<!--       <param name="build.main.java.version" value="8"/> -->
625	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
593	<	<!--     </antcall> -->
622	>	<antcall target="clean"/>
623	>	<antcall target="test">
624	>	<param name="build.main.java.version" value="9"/>
625	>	</antcall>
626
627	<	<!--     <antcall target="clean"/> -->
628	<	<!--     <antcall target="test"> -->
629	<	<!--       <param name="build.main.java.version" value="9"/> -->
630	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
599	<	<!--     </antcall> -->
627	>	<antcall target="clean"/>
628	>	<antcall target="test">
629	>	<param name="build.main.java.version" value="10"/>
630	>	</antcall>
631
632	<	<!--   </target> -->
632	>	<antcall target="clean"/>
633	>	<antcall target="test">
634	>	<param name="build.main.java.version" value="11"/>
635	>	</antcall>
636	>
637	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
638	>	<antcall target="clean"/>
639	>
640	>	</target>
641
642
643
644		<target name="configure-compiler">
645		<fail message="ant version too old">
646	<	<condition>
608	<	<not> <antversion atleast="1.9.1"/> </not>
609	<	</condition>
646	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
647		</fail>
648
649		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 652 | Line 689
689		<java classname="ALoops" fork="true">
690		<classpath refid="loops.classpath"/>
691		</java>
655	–
692		</target>
693
694
695		<target name="compile-test-loops" depends="jar"
696	<	description="compile all the perf tests in src/test/loops">
696	>	description="Compiles all the perf tests in src/test/loops">
697
698		<mkdir dir="${build.dir}/test/loops"/>
699
#	Line 669 | Line 705
705		includeAntRuntime="false"
706		includeJavaRuntime="false"
707		encoding="ASCII"
708	<	executable="${javac9}"
708	>	executable="${build.main.javac}"
709		fork="true">
710
711		<include name="*.java"/>
#	Line 677 | Line 713
713		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
714		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
715		<compilerarg line="${build.args}"/>
680	–
716		</javac>
682	–
717		</target>
718
719
#	Line 705 | Line 739
739		encoding="ASCII"
740		executable="${javac8}"
741		fork="true">
708	–
742		<include name="**/*.java"/>
743		<compilerarg value="-Xprefer:source"/>
744		<compilerarg value="-XDignore.symbol.file=true"/>
745		<compilerarg value="-Xlint:all"/>
746		<compilerarg value="-Werror"/>
747		<compilerarg line="${build.args}"/>
715	–
748		</javac>
749		</target>
750
#	Line 736 | Line 768
768		encoding="ASCII"
769		executable="${javac8}"
770		fork="true">
739	–
771		<include name="**/*.java"/>
772		<compilerarg value="-Xprefer:source"/>
773		<compilerarg value="-XDignore.symbol.file=true"/>
774		<compilerarg value="-Xlint:all"/>
775	<	<compilerarg value="-Xdoclint:all/protected"/>
775	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
776		<compilerarg line="${build.args}"/>
746	–
777		</javac>
778		</target>
779
#	Line 759 | Line 789
789		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
790		</manifest>
791		</jar>
762	–
792		</target>
793
794
#	Line 775 | Line 804
804		<!-- JDK9+ test classes -->
805		<exclude name="*9Test.java"/>
806		<exclude name="*10Test.java"/>
807	+	<compilerarg value="-Werror"/>
808		</javac-elements>
809		</run-tck-tests>
810		</target>
#	Line 792 | Line 822
822
823		<target name="4jdk8-test"
824		depends="4jdk8-tck, 4jdk8-jtreg"
825	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
796	<	</target>
825	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
826
827
828		<target name="4jdk8docs"
#	Line 809 | Line 838
838		access="${build.javadoc.access}"
839		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
840		classpath=""
841	+	source="8"
842		executable="${javadoc8}"
843		failonerror = "true">
844		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 816 | Line 846
846		</fileset>
847		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
848		<arg value="-XDignore.symbol.file=true"/>
849	<	<arg value="-tag"/>
850	<	<arg value="${javadoc.jls.option}"/>
851	<	<!-- @apiNote currently unused -->
852	<	<!--       <arg value="-tag"/> -->
853	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
824	<	<arg value="-tag"/>
825	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826	<	<arg value="-tag"/>
827	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
849	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
850	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
851	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
852	>	<!-- @apiNote tag currently unused -->
853	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
854		</javadoc>
855		</target>
856
#	Line 836 | Line 862
862
863		<target name="4jdk8clean"
864		description="Removes all 4jdk8 build products">
839	–
865		<delete dir="${build.4jdk8.dir}"/>
841	–
866		</target>
867
868
#	Line 854 | Line 878
878		</target>
879
880
881	+	<!-- jsr166 4jdk7 (no longer maintained) -->
882
883	<	<!-- jsr166 4jdk7 -->
859	<
860	<	<target name="4jdk7compile"
861	<	depends="configure-compiler"
862	<	description="Compiles src/jdk7 sources, targeting jdk7">
863	<
883	>	<target name="4jdk7compile" depends="configure-compiler">
884		<mkdir dir="${build.4jdk7.classes.dir}"/>
885
886		<javac srcdir="${4jdk7src.dir}"
#	Line 884 | Line 904
904		<compilerarg value="-Xlint:all"/>
905		<compilerarg value="-Werror"/>
906		<compilerarg line="${build.args}"/>
887	–
907		</javac>
908		</target>
909
910	<	<target name="4jdk7doclint"
892	<	depends="configure-compiler"
893	<	description="Finds doclint warnings">
894	<
910	>	<target name="4jdk7doclint" depends="configure-compiler">
911		<mkdir dir="${build.4jdk7.classes.dir}"/>
912
913		<javac srcdir="${4jdk7src.dir}"
#	Line 915 | Line 931
931		<compilerarg value="-Xlint:all"/>
932		<compilerarg value="-Xdoclint:all/protected"/>
933		<compilerarg line="${build.args}"/>
918	–
934		</javac>
935		</target>
936
937	<
923	<	<target name="4jdk7jar"
924	<	depends="4jdk7compile"
925	<	description="Builds library jar from compiled sources">
926	<
937	>	<target name="4jdk7jar" depends="4jdk7compile">
938		<jar destfile="${4jdk7product.jar}">
939		<fileset dir="${build.4jdk7.classes.dir}"/>
940		<manifest>
#	Line 931 | Line 942
942		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
943		</manifest>
944		</jar>
934	–
945		</target>
946
947	<
938	<	<target name="4jdk7-tck"
939	<	depends="4jdk7jar"
940	<	description="Runs tck tests for jsr166-4jdk7 directly">
941	<
947	>	<target name="4jdk7-tck" depends="4jdk7jar">
948		<run-tck-tests
949		target="7"
950		workdir="${build.4jdk7.dir}"
#	Line 956 | Line 962
962		<exclude name="SplittableRandomTest.java"/>
963		<exclude name="StampedLockTest.java"/>
964		<exclude name="SubmissionPublisherTest.java"/>
965	+	<compilerarg value="-Werror"/>
966		</javac-elements>
967		</run-tck-tests>
968		</target>
969
963	–
970		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
971	<	<target name="4jdk7-tck-junit"
966	<	depends="4jdk7compile">
971	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
972
973		<junit printsummary="true"
974		showoutput="true"
#	Line 985 | Line 990
990
991		<test name="${jsr166.tckTestClass}" haltonfailure="no">
992		</test>
988	–
993		</junit>
994		</target>
995
996	<	<target name="4jdk7-jtreg"
993	<	depends="4jdk7jar"
994	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
996	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
997		<run-jtreg-tests
998		target="7"
999		workdir="${build.4jdk7.dir}"
1000		classes="${4jdk7product.jar}"/>
1001		</target>
1002
1003	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1004
1005	<	<target name="4jdk7-test"
1003	<	depends="4jdk7-tck, 4jdk7-jtreg"
1004	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1005	<	</target>
1006	<
1007	<
1008	<	<target name="4jdk7docs"
1009	<	description="Builds javadocs for src/jdk7 to dist dir">
1010	<
1005	>	<target name="4jdk7docs">
1006		<delete dir="${4jdk7docs.dir}"/>
1007		<mkdir dir="${4jdk7docs.dir}"/>
1008
#	Line 1028 | Line 1023
1023		</javadoc>
1024		</target>
1025
1026	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1027
1028	<	<target name="4jdk7dist"
1033	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1034	<	description="Puts all distributable products in single hierarchy"/>
1035	<
1036	<
1037	<	<target name="4jdk7clean"
1038	<	description="Removes all 4jdk7 build products">
1039	<
1028	>	<target name="4jdk7clean">
1029		<delete dir="${build.4jdk7.dir}"/>
1041	–
1030		</target>
1031
1032	<
1045	<	<target name="4jdk7dist-jar"
1046	<	depends="4jdk7clean, 4jdk7jar">
1032	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1033		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1034		</target>
1035
1036	<
1051	<	<target name="4jdk7dist-docs"
1052	<	depends="4jdk7clean, 4jdk7docs">
1036	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1037		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1038		</target>
1039
1040
1041	<	<!-- jsr166x -->
1058	<
1059	<	<target name="jsr166xcompile"
1060	<	depends="configure-compiler"
1061	<	description="Compiles jsr166x sources to build dir">
1041	>	<!-- jsr166x (no longer maintained) -->
1042
1043	+	<target name="jsr166xcompile" depends="configure-compiler">
1044		<mkdir dir="${build.jsr166x.classes.dir}"/>
1045
1046		<javac srcdir="${topsrc.dir}"
#	Line 1076 | Line 1057
1057		encoding="ASCII"
1058		executable="${javac7}"
1059		fork="true">
1079	–
1060		<include name="jsr166x/**/*.java"/>
1061		<compilerarg value="-XDignore.symbol.file=true"/>
1062		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1063		<compilerarg value="-Werror"/>
1064		<compilerarg line="${build.args}"/>
1085	–
1065		</javac>
1066		</target>
1067
1068	<
1090	<	<target name="jsr166xjar"
1091	<	depends="jsr166xcompile"
1092	<	description="Builds library jar from compiled sources">
1093	<
1068	>	<target name="jsr166xjar" depends="jsr166xcompile">
1069		<jar destfile="${jsr166x.jar}">
1070		<fileset dir="${build.jsr166x.classes.dir}"/>
1071		<manifest>
#	Line 1098 | Line 1073
1073		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1074		</manifest>
1075		</jar>
1101	–
1076		</target>
1077
1078	<
1105	<	<target name="jsr166xdocs"
1106	<	description="Builds javadocs to dist dir">
1107	<
1078	>	<target name="jsr166xdocs">
1079		<delete dir="${jsr166xdocs.dir}"/>
1080		<mkdir dir="${jsr166xdocs.dir}"/>
1081
#	Line 1119 | Line 1090
1090		failonerror = "true">
1091		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1092		<arg value="-XDignore.symbol.file=true"/>
1122	–
1093		</javadoc>
1094		</target>
1095
1096	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1097
1098	<	<target name="jsr166xdist"
1128	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1129	<	description="Puts all distributable products in single hierarchy"/>
1130	<
1131	<
1132	<	<target name="jsr166xclean"
1133	<	description="Removes all jsr166x build products">
1134	<
1098	>	<target name="jsr166xclean">
1099		<delete dir="${build.jsr166x.dir}"/>
1136	–
1100		</target>
1101
1102	<
1140	<	<target name="jsr166xdist-jar"
1141	<	depends="jsr166xclean, jsr166xjar">
1102	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1103		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1104		</target>
1105
1106	<	<target name="jsr166xdist-docs"
1146	<	depends="jsr166xclean, jsr166xdocs">
1106	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1107		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1108		</target>
1109
1150	–	<!-- jsr166y -->
1110
1111	+	<!-- jsr166y (no longer maintained) -->
1112
1113	<	<target name="jsr166ycompile"
1154	<	depends="configure-compiler"
1155	<	description="Compiles jsr166y sources">
1156	<
1113	>	<target name="jsr166ycompile" depends="configure-compiler">
1114		<mkdir dir="${build.jsr166y.classes.dir}"/>
1115
1116		<javac srcdir="${topsrc.dir}"
#	Line 1176 | Line 1133
1133		<compilerarg value="-Xlint:all"/>
1134		<compilerarg value="-Werror"/>
1135		<compilerarg line="${build.args}"/>
1179	–
1136		</javac>
1137		</target>
1138
1139	<
1184	<	<target name="jsr166yjar"
1185	<	depends="jsr166ycompile"
1186	<	description="Builds library jar from compiled sources">
1187	<
1139	>	<target name="jsr166yjar" depends="jsr166ycompile">
1140		<jar destfile="${jsr166y.jar}" index="true">
1141		<fileset dir="${build.jsr166y.classes.dir}"/>
1142		<manifest>
#	Line 1192 | Line 1144
1144		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1145		</manifest>
1146		</jar>
1195	–
1147		</target>
1148
1149	<
1199	<	<target name="jsr166ydocs"
1200	<	description="Builds javadocs to dist dir">
1201	<
1149	>	<target name="jsr166ydocs">
1150		<delete dir="${jsr166ydocs.dir}"/>
1151		<mkdir dir="${jsr166ydocs.dir}"/>
1152
#	Line 1213 | Line 1161
1161		failonerror = "true">
1162		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1163		<arg value="-XDignore.symbol.file=true"/>
1216	–
1164		</javadoc>
1165		</target>
1166
1167	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1168
1169	<	<target name="jsr166ydist"
1222	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1223	<	description="Puts all distributable products in single hierarchy"/>
1224	<
1225	<
1226	<	<target name="jsr166yclean"
1227	<	description="Removes all jsr166y build products">
1228	<
1169	>	<target name="jsr166yclean">
1170		<delete dir="${build.jsr166y.dir}"/>
1230	–
1171		</target>
1172
1173	<
1234	<	<target name="jsr166ydist-jar"
1235	<	depends="jsr166yclean, jsr166yjar">
1173	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1174		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1175		</target>
1176
1177	<	<target name="jsr166ydist-docs"
1240	<	depends="jsr166yclean, jsr166ydocs">
1177	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1178		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1179		</target>
1180
1181
1182	<	<!-- extra166y -->
1246	<
1247	<
1248	<	<target name="extra166ycompile"
1249	<	depends="configure-compiler, jsr166yjar"
1250	<	description="Compiles extra166y sources">
1182	>	<!-- extra166y (no longer maintained) -->
1183
1184	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1185		<mkdir dir="${build.extra166y.classes.dir}"/>
1186
1187		<javac srcdir="${topsrc.dir}"
#	Line 1271 | Line 1204
1204		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1205		<compilerarg value="-Werror"/>
1206		<compilerarg line="${build.args}"/>
1274	–
1207		</javac>
1208		</target>
1209
1210	<
1279	<	<target name="extra166yjar"
1280	<	depends="extra166ycompile"
1281	<	description="Builds library jar from compiled sources">
1282	<
1210	>	<target name="extra166yjar" depends="extra166ycompile">
1211		<jar destfile="${extra166y.jar}" index="true">
1212		<fileset dir="${build.extra166y.classes.dir}"/>
1213		<manifest>
#	Line 1287 | Line 1215
1215		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1216		</manifest>
1217		</jar>
1290	–
1218		</target>
1219
1220	<
1294	<	<target name="extra166ydocs"
1295	<	description="Builds javadocs to build dir">
1296	<
1220	>	<target name="extra166ydocs">
1221		<delete dir="${extra166ydocs.dir}"/>
1222		<mkdir dir="${extra166ydocs.dir}"/>
1223
#	Line 1307 | Line 1231
1231		executable="${javadoc7}">
1232		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1233		<arg value="-XDignore.symbol.file=true"/>
1310	–
1234		</javadoc>
1235		</target>
1236
1237	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1238
1239	<	<target name="extra166ydist"
1316	<	depends="extra166ydist-jar, extra166ydist-docs"
1317	<	description="Puts all distributable products in single hierarchy"/>
1318	<
1319	<
1320	<	<target name="extra166yclean"
1321	<	description="Removes all extra166y build products">
1322	<
1239	>	<target name="extra166yclean">
1240		<delete dir="${build.extra166y.dir}"/>
1324	–
1241		</target>
1242
1243	<
1328	<	<target name="extra166ydist-jar"
1329	<	depends="extra166yclean, extra166yjar">
1243	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1244		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1245		</target>
1246
1247	<	<target name="extra166ydist-docs"
1334	<	depends="extra166yclean, extra166ydocs">
1247	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1248		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1249		</target>
1250
1251	<	<!-- jsr166e -->
1251	>
1252	>	<!-- jsr166e (no longer maintained) -->
1253
1254		<property name="build.jsr166e.java.version" value="6"/>
1255		<property name="build.jsr166e.javac" value="${javac6}"/>
1256
1257	<	<target name="jsr166ecompile"
1344	<	depends="configure-compiler"
1345	<	description="Compiles jsr166e sources">
1346	<
1257	>	<target name="jsr166ecompile" depends="configure-compiler">
1258		<mkdir dir="${build.jsr166e.classes.dir}"/>
1259
1260		<javac srcdir="${topsrc.dir}"
#	Line 1364 | Line 1275
1275		<compilerarg value="-Xlint:all"/>
1276		<compilerarg value="-Werror"/>
1277		<compilerarg line="${build.args}"/>
1367	–
1278		</javac>
1279		</target>
1280
1371	–	<!-- jsr166e: find doclint errors -->
1281		<target name="jsr166edoclint">
1373	–
1282		<mkdir dir="${build.jsr166e.classes.dir}"/>
1283
1284		<javac srcdir="${topsrc.dir}"
#	Line 1392 | Line 1300
1300		<compilerarg value="-Xlint:all"/>
1301		<compilerarg value="-Werror"/>
1302		<compilerarg value="-Xdoclint:all/protected"/>
1395	–
1303		</javac>
1304		</target>
1305
1306	<
1400	<	<target name="jsr166ejar"
1401	<	depends="jsr166ecompile"
1402	<	description="Builds library jar from compiled sources">
1403	<
1306	>	<target name="jsr166ejar" depends="jsr166ecompile">
1307		<jar destfile="${jsr166e.jar}" index="true">
1308		<fileset dir="${build.jsr166e.classes.dir}"/>
1309		<manifest>
#	Line 1408 | Line 1311
1311		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1312		</manifest>
1313		</jar>
1411	–
1314		</target>
1315
1316	<
1415	<	<target name="jsr166edocs"
1416	<	description="Builds javadocs to build dir">
1417	<
1316	>	<target name="jsr166edocs">
1317		<delete dir="${jsr166edocs.dir}"/>
1318		<mkdir dir="${jsr166edocs.dir}"/>
1319
#	Line 1428 | Line 1327
1327		failonerror = "true">
1328		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1329		<arg value="-XDignore.symbol.file=true"/>
1431	–
1330		</javadoc>
1331		</target>
1332
1333	<
1436	<	<target name="jsr166e-tck-one-java-version"
1437	<	depends="jsr166ejar">
1438	<
1333	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1334		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440	–
1335		<run-tck-tests
1336		tck.src.dir="${test.src.dir}/tck-jsr166e"
1337		target="${build.jsr166e.java.version}"
#	Line 1445 | Line 1339
1339		classes="${jsr166e.jar}"/>
1340		</target>
1341
1342	<	<target name="jsr166e-tck"
1449	<	description="Runs tck tests for jsr166e for multiple java versions">
1342	>	<target name="jsr166e-tck">
1343
1344		<!--     <antcall target="clean"/> -->
1345		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1467 | Line 1360
1360		</antcall>
1361		</target>
1362
1363	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1364
1365	<	<target name="jsr166e-test"
1472	<	depends="jsr166e-tck"
1473	<	description="Runs all tests for jsr166e">
1474	<	</target>
1475	<
1476	<	<target name="jsr166edist"
1477	<	depends="jsr166edist-jar, jsr166edist-docs"
1478	<	description="Puts all distributable products in single hierarchy"/>
1365	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1366
1367	<
1481	<	<target name="jsr166eclean"
1482	<	description="Removes all jsr166e build products">
1367	>	<target name="jsr166eclean">
1368		<delete dir="${build.jsr166e.dir}"/>
1369		</target>
1370
1486	–
1371		<target name="jsr166edist-jar"
1372		depends="jsr166eclean, jsr166ejar">
1373		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1374		</target>
1375
1376	<	<target name="jsr166edist-docs"
1493	<	depends="jsr166eclean, jsr166edocs">
1376	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1377		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1378		</target>
1379
#	Line 1510 | Line 1393
1393		</antcall>
1394		</target>
1395
1396	+
1397	+	<!-- ==============================================================
1398	+	Experimental errorprone support - http://errorprone.info
1399	+	=================================================================== -->
1400	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1401	+	<property name="errorprone.jsr166.flags"
1402	+	value="-Xep:HashtableContains:OFF
1403	+	-Xep:JdkObsolete:OFF
1404	+	-Xep:MissingOverride:OFF
1405	+	-Xep:MissingFail:OFF
1406	+	-Xep:MixedArrayDimensions:ERROR
1407	+	-Xep:RemoveUnusedImports:ERROR
1408	+	-Xep:EmptyIf:ERROR
1409	+	-Xep:MultipleTopLevelClasses:ERROR
1410	+	-Xep:ClassName:ERROR
1411	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1412	+	-Xep:RedundantThrows:ERROR
1413	+	-Xep:IdentityBinaryExpression:WARN
1414	+	-Xep:MethodCanBeStatic:WARN"/>
1415	+	<!-- -Xep:WildcardImport:ERROR -->
1416	+	<property name="errorprone.jsr166.test.flags"
1417	+	value="-Xep:StringSplitter:OFF
1418	+	-Xep:BoxedPrimitiveConstructor:OFF
1419	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1420	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1421	+	<target name="errorprone"
1422	+	depends="clean, configure-compiler"
1423	+	description="Run errorprone over jsr166 source code (experimental)">
1424	+
1425	+	<local name="destdir"/>
1426	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1427	+	<mkdir dir="${destdir}"/>
1428	+
1429	+	<javac srcdir="${src.dir}"
1430	+	destdir="${destdir}"
1431	+	debug="${build.debug}"
1432	+	debuglevel="${build.debuglevel}"
1433	+	deprecation="${build.deprecation}"
1434	+	classpath=""
1435	+	includeAntRuntime="false"
1436	+	includeJavaRuntime="false"
1437	+	encoding="ASCII"
1438	+	executable="${build.main.javac}"
1439	+	fork="true">
1440	+
1441	+	<include name="**/*.java"/>
1442	+	<compilerarg value="-XDcompilePolicy=simple"/>
1443	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1444	+	<compilerarg value="-Xplugin:ErrorProne
1445	+	${errorprone.jsr166.flags}"/>
1446	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1447	+	<compilerarg value="-Xprefer:source"/>
1448	+	<compilerarg value="-XDignore.symbol.file=true"/>
1449	+	<compilerarg value="-Xlint:all"/>
1450	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1451	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1452	+	<compilerarg line="${build.args}"/>
1453	+	</javac>
1454	+
1455	+	<jar destfile="${product.jar}">
1456	+	<fileset dir="${destdir}"/>
1457	+	</jar>
1458	+
1459	+	<run-tck-tests
1460	+	target="${build.main.java.version}"
1461	+	workdir="${build.dir}"
1462	+	classes="${product.jar}">
1463	+	<javac-elements>
1464	+	<compilerarg value="-XDcompilePolicy=simple"/>
1465	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1466	+	<compilerarg value="-Xplugin:ErrorProne
1467	+	${errorprone.jsr166.flags}
1468	+	${errorprone.jsr166.test.flags}"/>
1469	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1470	+	</javac-elements>
1471	+	</run-tck-tests>
1472	+	</target>
1473	+
1474	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1475	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1476	+	<target name="errorprone-jtreg"
1477	+	depends="jar"
1478	+	description="Run errorprone over jtreg tests (experimental)">
1479	+
1480	+	<run-jtreg-tests
1481	+	target="${build.main.java.version}"
1482	+	workdir="${build.dir}"
1483	+	classes="${product.jar}"
1484	+	verbose="all">
1485	+	<jtreg-elements>
1486	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1487	+	<arg value="-javacoption:-processorpath"/>
1488	+	<arg value="-javacoption:${errorprone.jar}"/>
1489	+	<arg value="-javacoption:-Xplugin:ErrorProne
1490	+	${errorprone.jsr166.flags}
1491	+	${errorprone.jsr166.test.flags}
1492	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1493	+	</jtreg-elements>
1494	+	</run-jtreg-tests>
1495	+	</target>
1496	+
1497	+
1498		<!-- ==============================================================
1499		Running guava tests against jsr166 code
1500		=================================================================== -->
#	Line 1562 | Line 1547
1547		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1548		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1549		<junit printsummary="true" showoutput="true" haltonfailure="true"
1550	<	jvm="${java9}" fork="true">
1551	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1550	>	jvm="${build.main.java}" fork="true">
1551	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1552		<formatter type="brief"/>
1553		<classpath>
1554		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines