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.129 by jsr166, Wed Jan 23 07:17:13 2013 UTC vs.
Revision 1.148 by jsr166, Sat Jul 20 18:26:16 2013 UTC

#	Line 22 | Line 22
22		$HOME/jdk/src/jdk8
23		where each of the above is a complete JDK source tree
24		(e.g. mercurial forest) or a symlink to same.
25	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
29	>	<!-- Display main targets by running 'ant -projecthelp' -->
30	>	<target name="usage">
31		<java classname="org.apache.tools.ant.Main">
32		<arg value="-projecthelp" />
33		</java>
#	Line 41 | Line 43
43		<property name="build.debug"          value="true"/>
44		<property name="build.debuglevel"     value="source,lines,vars"/>
45		<property name="build.deprecation"    value="false"/>
46	+	<property name="build.javadoc.access" value="protected"/>
47	+
48	+	<!-- Tck options; see JSR166TestCase.java -->
49	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
50	+	<property name="jsr166.profileTests"     value="false"/>
51	+	<property name="jsr166.profileThreshold" value="100"/>
52	+	<property name="jsr166.runsPerTest"      value="1"/>
53	+	<!-- Allow running an individual tck test class -->
54	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
55	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
56
57		<!-- Build locations -->
58		<property name="build.dir"                   location="build"/>
#	Line 168 | Line 180
180
181		<macrodef name="run-tck-tests">
182		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
171	–	<attribute name="source" default="6"/>
183		<attribute name="target"/>
184	+	<attribute name="compile-target" default="@{target}"/>
185		<attribute name="workdir"/>
186		<attribute name="classes"/>
187		<attribute name="jvmflags" default=""/>
188	+	<element name="javac-elements" optional="true"/>
189		<sequential>
190
191		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 182 | Line 195
195		debug="${build.debug}"
196		debuglevel="${build.debuglevel}"
197		deprecation="${build.deprecation}"
198	<	source="@{source}"
198	>	source="@{compile-target}"
199	>	target="@{compile-target}"
200		classpath="${junit.jar}"
201	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
201	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
202		includeAntRuntime="false"
203		includeJavaRuntime="false"
204	<	executable="${javac@{target}}"
204	>	executable="${javac@{compile-target}}"
205		fork="true">
206
207		<include name="*.java"/>
208		<compilerarg value="-XDignore.symbol.file=true"/>
209		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
210		<compilerarg line="${build.args}"/>
211	+	<javac-elements/>
212
213		</javac>
214
215	<	<java classname="JSR166TestCase"
215	>	<java classname="${jsr166.tckTestClass}"
216		failonerror="true"
217		jvm="${java@{target}}"
218		fork="true">
219		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
220		<jvmarg line="@{jvmflags}"/>
221	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
222	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
223	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
224		<classpath>
225		<pathelement location="${junit.jar}"/>
226		<pathelement location="@{workdir}/tck-classes"/>
#	Line 212 | Line 230
230		</sequential>
231		</macrodef>
232
233	+	<macrodef name="run-jtreg-tests">
234	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
235	+	<attribute name="source" default="7"/>
236	+	<attribute name="target"/>
237	+	<attribute name="workdir"/>
238	+	<attribute name="classes"/>
239	+	<attribute name="jtregflags" default=""/>
240	+	<sequential>
241	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
242	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
243	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
244	+	<mkdir dir="@{workdir}/JTreport"/>
245	+	<jtreg dir="@{jtreg.src.dir}"
246	+	jdk="${jdk@{target}.home}"
247	+	workDir="@{workdir}/JTwork"
248	+	reportDir="@{workdir}/JTreport">
249	+
250	+	<arg value="-Xbootclasspath/p:@{classes}"/>
251	+	<arg value="-agentvm"/>
252	+	<arg value="-v:nopass,fail"/>
253	+	<arg value="-vmoptions:-esa -ea"/>
254	+	<arg value="-automatic"/>
255	+	<arg value="-k:!ignore"/>
256	+	<arg line="@{jtregflags}"/>
257	+	</jtreg>
258	+	</sequential>
259	+	</macrodef>
260	+
261		<!-- ALoops classpath -->
262		<path id="loops.classpath">
263		<pathelement location="${build.loops.dir}"/>
#	Line 245 | Line 291
291		fork="true">
292
293		<include name="**/*.java"/>
294	+	<compilerarg value="-Xprefer:source"/>
295		<compilerarg value="-XDignore.symbol.file=true"/>
296		<compilerarg value="-Xlint:all"/>
297	+	<compilerarg value="-Xdoclint:all/protected"/>
298	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
299		<compilerarg line="${build.args}"/>
300
301		</javac>
#	Line 263 | Line 312
312		</target>
313
314
266	–	<target name="test"
267	–	depends="configure-tests, report-tests"
268	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
269	–
270	–
315		<target name="docs"
316		description="Builds javadocs for src/main to dist dir">
317
#	Line 281 | Line 325
325		packagenames="none"
326		link="${jdkapi8docs.url}"
327		overview="${src.dir}/intro.html"
328	+	access="${build.javadoc.access}"
329		sourcepath="${src.dir}:${jdk8src.dir}"
330		classpath=""
331		executable="${javadoc8}">
332		<fileset dir="${src.dir}" defaultexcludes="yes">
333		<include name="**/*.java"/>
334		</fileset>
335	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
336		<arg value="-XDignore.symbol.file=true"/>
337		<arg value="-tag"/>
338		<arg value="${javadoc.jls.option}"/>
339	+	<arg value="-tag"/>
340	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
341	+	<arg value="-tag"/>
342	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
343	+	<arg value="-tag"/>
344	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
345		</javadoc>
346		</target>
347
#	Line 328 | Line 380
380		<target name="dist-clean"
381		description="Removes all build and distribution products">
382
383	+	<delete dir="${build.dir}"/>
384		<delete dir="${dist.dir}"/>
385
386		</target>
387
388
336	–	<!-- Internal targets -->
337	–
338	–
389		<target name="dist-jar"
390		depends="clean, jar">
391		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 347 | Line 397
397		</target>
398
399
400	<	<target name="compile-tests"
401	<	depends="jar">
402	<
353	<	<mkdir dir="${build.testcases.dir}"/>
354	<
355	<	<javac srcdir="${tck.src.dir}"
356	<	destdir="${build.testcases.dir}"
357	<	debug="${build.debug}"
358	<	debuglevel="${build.debuglevel}"
359	<	deprecation="${build.deprecation}"
360	<	source="6"
361	<	classpath="${junit.jar}"
362	<	bootclasspath="@{product.jar}:${bootclasspath6}"
363	<	includeAntRuntime="false"
364	<	includeJavaRuntime="false"
365	<	executable="${javac8}"
366	<	fork="true">
367	<
368	<	<include name="**/*.java"/>
369	<	<compilerarg value="-XDignore.symbol.file=true"/>
370	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
371	<	<compilerarg line="${build.args}"/>
372	<
373	<	</javac>
374	<
375	<	<javac srcdir="${test.src.dir}"
376	<	destdir="${build.testcases.dir}"
377	<	debug="${build.debug}"
378	<	debuglevel="${build.debuglevel}"
379	<	deprecation="${build.deprecation}"
380	<	source="6"
381	<	classpath=""
382	<	bootclasspath="@{product.jar}:${bootclasspath6}"
383	<	includeAntRuntime="false"
384	<	includeJavaRuntime="false"
385	<	executable="${javac8}"
386	<	fork="true">
387	<
388	<	<include name="jsr166/test/**/*.java"/>
389	<	<compilerarg value="-XDignore.symbol.file=true"/>
390	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
391	<	<compilerarg line="${build.args}"/>
392	<
393	<	</javac>
394	<
395	<	<!--
396	<	<javac srcdir="${jtreg.src.dir}"
397	<	destdir="${build.testcases.dir}"
398	<	debug="${build.debug}"
399	<	debuglevel="${build.debuglevel}"
400	<	deprecation="${build.deprecation}"
401	<	source="${build.sourcelevel}"
402	<	fork="true">
403	<
404	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
405	<	<compilerarg value="-XDignore.symbol.file=true"/>
406	<	<compilerarg line="${build.args}"/>
407	<
408	<	</javac>
409	<	-->
400	>	<target name="test-tck"
401	>	depends="jar"
402	>	description="Runs tck tests for main directly">
403
404	+	<run-tck-tests
405	+	target="8"
406	+	workdir="${build.dir}"
407	+	classes="${product.jar}"/>
408		</target>
409
410	<
411	<	<target name="run-tests"
412	<	depends="compile-tests">
413	<
414	<	<!-- May be overridden by user.properties -->
415	<	<property name="testcase" value="*"/>
416	<
420	<	<mkdir dir="${build.reports.dir}"/>
421	<
422	<	<junit printsummary="true"
423	<	showoutput="true"
424	<	errorProperty="junit.failed"
425	<	failureProperty="junit.failed"
426	<	dir="${build.reports.dir}"
427	<	jvm="${java8}"
428	<	fork="true">
429	<
430	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
431	<	<jvmarg value="-server"/>
432	<	<jvmarg value="-showversion"/>
433	<
434	<	<classpath refid="test.classpath"/>
435	<
436	<	<formatter type="xml"/>
437	<
438	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
439	<	<fileset dir="${tck.src.dir}">
440	<	<include name="**/${testcase}Test.java"/>
441	<	</fileset>
442	<	</batchtest>
443	<
444	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
445	<	<fileset dir="${test.src.dir}">
446	<	<include name="jsr166/test/**/${testcase}Test.java"/>
447	<	</fileset>
448	<	</batchtest>
449	<
450	<	<!--
451	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
452	<	<fileset dir="${jtreg.src.dir}">
453	<	<include name="**/${testcase}Test.java"/>
454	<	</fileset>
455	<	</batchtest>
456	<	-->
457	<
458	<	</junit>
459	<
410	>	<target name="test-jtreg"
411	>	depends="jar"
412	>	description="Runs jtreg tests for main using the jtreg ant task">
413	>	<run-jtreg-tests
414	>	target="8"
415	>	workdir="${build.dir}"
416	>	classes="${product.jar}"/>
417		</target>
418
419	<
420	<	<target name="report-tests"
421	<	depends="run-tests">
465	<
466	<	<!-- Sets junit.report.format to frames if redirection is present,
467	<	otherwise sets it to noframes. -->
468	<	<available property="junit.report.format"
469	<	value="frames"
470	<	classname="org.apache.xalan.lib.Redirect"
471	<	/>
472	<	<property name="junit.report.format" value="noframes"/>
473	<
474	<	<junitreport todir="${build.reports.dir}">
475	<	<fileset dir="${build.reports.dir}">
476	<	<include name="TEST-*.xml"/>
477	<	</fileset>
478	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
479	<	/>
480	<	</junitreport>
481	<
482	<	<fail message="Test Cases Failed" if="junit.failed"/>
483	<
419	>	<target name="test"
420	>	depends="test-tck, test-jtreg"
421	>	description="Runs tck and jtreg tests for main">
422		</target>
423
424
425	+
426		<target name="configure-compiler">
427
428		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 501 | Line 440
440		</target>
441
442
504	–	<target name="configure-tests"
505	–	depends="configure-compiler">
506	–
507	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
508	–	<available property="junit.available"
509	–	classname="junit.framework.Protectable"/>
510	–
511	–	<!-- Xalan -->
512	–	<available property="xalan.available"
513	–	classname="org.apache.xalan.Version"/>
514	–
515	–
516	–	<!-- Ant 1.6beta and later don't need or want this check -->
517	–	<!--
518	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
519	–	unless="junit.available"/>
520	–
521	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
522	–	unless="xalan.available"/>
523	–	-->
524	–
525	–	</target>
526	–
443
444		<!-- Various demos and test programs -->
445
#	Line 576 | Line 492
492		fork="true">
493
494		<include name="**/*.java"/>
495	+	<compilerarg value="-Xprefer:source"/>
496		<compilerarg value="-XDignore.symbol.file=true"/>
497		<compilerarg value="-Xlint:all"/>
498		<compilerarg line="${build.args}"/>
#	Line 602 | Line 519
519		<run-tck-tests
520		target="7"
521		workdir="${build.4jdk7.dir}"
522	<	classes="${4jdk7product.jar}"/>
522	>	classes="${4jdk7product.jar}">
523	>	<javac-elements>
524	>	<!-- JDK8+ test classes -->
525	>	<exclude name="*8Test.java"/>
526	>	<exclude name="DoubleAccumulatorTest.java"/>
527	>	<exclude name="DoubleAdderTest.java"/>
528	>	<exclude name="LongAccumulatorTest.java"/>
529	>	<exclude name="LongAdderTest.java"/>
530	>	<exclude name="CompletableFutureTest.java"/>
531	>	<exclude name="SplittableRandomTest.java"/>
532	>	<exclude name="StampedLockTest.java"/>
533	>	</javac-elements>
534	>	</run-tck-tests>
535		</target>
536
537
#	Line 628 | Line 557
557
558		<formatter type="brief"/>
559
560	<	<test name="JSR166TestCase" haltonfailure="no">
560	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
561		</test>
562
563		</junit>
564		</target>
565
566		<target name="4jdk7-test-jtreg"
567	<	depends="4jdk7compile"
567	>	depends="4jdk7jar"
568		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
569	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
570	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
571	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
572	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
573	<	<jtreg dir="${jtreg.src.dir}"
645	<	jdk="${jdk7.home}"
646	<	workDir="${build.4jdk7.dir}/JTwork"
647	<	reportDir="${build.4jdk7.dir}/JTreport">
648	<
649	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
650	<	<arg value="-agentvm"/>
651	<	<arg value="-v:nopass,fail"/>
652	<	<arg value="-vmoptions:-esa -ea"/>
653	<	<arg value="-automatic"/>
654	<	<arg value="-k:!ignore"/>
655	<	</jtreg>
569	>	<run-jtreg-tests
570	>	target="7"
571	>	workdir="${build.4jdk7.dir}"
572	>	classes="${4jdk7product.jar}"
573	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
574		</target>
575
576
#	Line 672 | Line 590
590		packagenames="none"
591		link="${jdkapi7docs.url}"
592		overview="${4jdk7src.dir}/intro.html"
593	+	access="${build.javadoc.access}"
594		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
595		classpath=""
596		executable="${javadoc7}">
#	Line 696 | Line 615
615		</target>
616
617
699	–	<target name="4jdk7dist-clean"
700	–	description="Removes all build and distribution products">
701	–
702	–	</target>
703	–
618		<target name="4jdk7dist-jar"
619		depends="4jdk7clean, 4jdk7jar">
620		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 763 | Line 677
677		<javadoc destdir="${jsr166xdocs.dir}"
678		packagenames="jsr166x.*"
679		link="${jdkapidocs.url}"
680	+	access="${build.javadoc.access}"
681		sourcepath="${topsrc.dir}:${jdk6src.dir}"
682		bootclasspath="${bootclasspath6}"
683		source="5"
#	Line 786 | Line 701
701		</target>
702
703
789	–	<target name="jsr166xdist-clean"
790	–	description="Removes all build and distribution products">
791	–
792	–	</target>
793	–
794	–
704		<target name="jsr166xdist-jar"
705		depends="jsr166xclean, jsr166xjar">
706		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 853 | Line 762
762		<javadoc destdir="${jsr166ydocs.dir}"
763		packagenames="jsr166y.*"
764		link="${jdkapidocs.url}"
765	+	access="${build.javadoc.access}"
766		sourcepath="${topsrc.dir}:${jdk6src.dir}"
767		bootclasspath="${bootclasspath6}"
768		source="6"
#	Line 876 | Line 786
786		</target>
787
788
879	–	<target name="jsr166ydist-clean"
880	–	description="Removes all build and distribution products">
881	–
882	–	</target>
883	–
789		<target name="jsr166ydist-jar"
790		depends="jsr166yclean, jsr166yjar">
791		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 943 | Line 848
848		<javadoc destdir="${extra166ydocs.dir}"
849		packagenames="extra166y.*"
850		link="${jdkapidocs.url}"
851	+	access="${build.javadoc.access}"
852		sourcepath="${topsrc.dir}:${jdk6src.dir}"
853		bootclasspath="${bootclasspath6}"
854		source="6"
#	Line 966 | Line 872
872		</target>
873
874
969	–	<target name="extra166ydist-clean"
970	–	description="Removes all build and distribution products">
971	–
972	–	</target>
973	–
875		<target name="extra166ydist-jar"
876		depends="extra166yclean, extra166yjar">
877		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 983 | Line 884
884
885		<!-- jsr166e -->
886
887	+	<property name="build.jsr166e.java.version" value="6"/>
888	+	<property name="build.jsr166e.javac" value="${javac6}"/>
889	+
890		<target name="jsr166ecompile"
891		depends="configure-compiler"
892		description="Compiles jsr166e sources">
#	Line 994 | Line 898
898		debug="${build.debug}"
899		debuglevel="${build.debuglevel}"
900		deprecation="${build.deprecation}"
901	<	source="7"
901	>	source="${build.jsr166e.java.version}"
902		classpath=""
903		includeAntRuntime="false"
904		includeJavaRuntime="false"
905	<	executable="${javac7}"
905	>	executable="${build.jsr166e.javac}"
906		fork="true">
907
908		<include name="jsr166e/**/*.java"/>
#	Line 1030 | Line 934
934		<javadoc destdir="${jsr166edocs.dir}"
935		packagenames="jsr166e.*"
936		link="${jdkapidocs.url}"
937	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
938	<	source="7"
937	>	access="${build.javadoc.access}"
938	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
939	>	source="${build.jsr166e.java.version}"
940		executable="${javadoc7}">
941		<arg value="-XDignore.symbol.file=true"/>
942
#	Line 1039 | Line 944
944		</target>
945
946
947	<	<target name="jsr166e-test-tck"
948	<	depends="jsr166ejar"
949	<	description="Runs tck tests for jsr166e">
947	>	<target name="jsr166e-test-tck-one-java-version"
948	>	depends="jsr166ejar">
949	>
950	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
951
952		<run-tck-tests
953		tck.src.dir="${test.src.dir}/tck-jsr166e"
954	<	source="7"
1049	<	target="8"
954	>	target="${build.jsr166e.java.version}"
955		workdir="${build.jsr166e.dir}"
956		classes="${jsr166e.jar}"/>
957		</target>
958
959	+	<target name="jsr166e-test-tck"
960	+	description="Runs tck tests for jsr166e for multiple java versions">
961	+
962	+	<!--     <antcall target="clean"/> -->
963	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
964	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
965	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
966	+	<!--     </antcall> -->
967	+
968	+	<antcall target="clean"/>
969	+	<antcall target="jsr166e-test-tck-one-java-version">
970	+	<param name="build.jsr166e.java.version" value="7"/>
971	+	<param name="build.jsr166e.javac" value="${javac7}"/>
972	+	</antcall>
973	+
974	+	<antcall target="clean"/>
975	+	<antcall target="jsr166e-test-tck-one-java-version">
976	+	<param name="build.jsr166e.java.version" value="6"/>
977	+	<param name="build.jsr166e.javac" value="${javac6}"/>
978	+	</antcall>
979	+	</target>
980	+
981	+
982	+	<target name="jsr166e-test"
983	+	depends="jsr166e-test-tck"
984	+	description="Runs all tests for jsr166e">
985	+	</target>
986
987		<target name="jsr166edist"
988		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1063 | Line 995
995		</target>
996
997
1066	–	<target name="jsr166edist-clean"
1067	–	description="Removes all build and distribution products">
1068	–
1069	–	</target>
1070	–
998		<target name="jsr166edist-jar"
999		depends="jsr166eclean, jsr166ejar">
1000		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1078 | Line 1005
1005		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1006		</target>
1007
1008	+
1009	+	<!-- Find buglets that can be detected by static build tools -->
1010	+
1011	+	<target name="lint">
1012	+	<antcall target="dists">
1013	+	<param name="build.javadoc.access" value="private"/>
1014	+	</antcall>
1015	+	</target>
1016	+
1017	+
1018		</project>

Diff Legend

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