You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by is...@apache.org on 2018/09/13 07:25:26 UTC
svn commit: r1840784 - in /tomcat/trunk: build.properties.default build.xml
Author: isapir
Date: Thu Sep 13 07:25:26 2018
New Revision: 1840784
URL: http://svn.apache.org/viewvc?rev=1840784&view=rev
Log:
Simplified required Ant version check per BZ 62705
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1840784&r1=1840783&r2=1840784&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Sep 13 07:25:26 2018
@@ -31,6 +31,7 @@ version.suffix=-dev
# ----- Build control flags -----
# Note enabling validation uses Checkstyle which is LGPL licensed
+ant.version.required=1.9.8
execute.validate=false
execute.test.nio=true
execute.test.nio2=true
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840784&r1=1840783&r2=1840784&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Sep 13 07:25:26 2018
@@ -33,6 +33,14 @@
<property file="build.properties"/>
<property file="build.properties.default"/>
+ <!-- Check Ant Version -->
+ <antversion property="ant.version.running" />
+ <fail message="Ant version ${ant.version.required} or newer is required (version ${ant.version.running} is installed)">
+ <condition>
+ <not><antversion atleast="${ant.version.required}" /></not>
+ </condition>
+ </fail>
+
<!-- Project Name -->
<property name="project" value="apache-tomcat" />
@@ -41,8 +49,6 @@
<property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor" value="${version.major}.${version.minor}" />
- <property name="ant.min.version" value="1.9.8" />
-
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
@@ -510,17 +516,6 @@
<!-- =========================== Build targets =========================== -->
- <target name="check-ant-version">
- <antversion property="version.running" />
- <fail message="Ant version ${ant.min.version} or newer is required. Current version is ${version.running}.">
- <condition>
- <not>
- <antversion atleast="${ant.min.version}" />
- </not>
- </condition>
- </fail>
- </target>
-
<target name="build-prepare">
<!-- Required so we can compile -->
@@ -693,7 +688,7 @@
</copy>
</target>
- <target name="compile" depends="check-ant-version,download-compile,validate">
+ <target name="compile" depends="download-compile,validate">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1840784 - in /tomcat/trunk: build.properties.default
build.xml
Posted by Igal Sapir <is...@apache.org>.
On 9/13/2018 12:54 AM, Konstantin Kolinko wrote:
> 1. The version of Ant is already available as ${ant.version}. There is
> no need to call antversion task explicitly to get it.
>
> See built-in properties in Ant Manual
> http://ant.apache.org/manual-1.9.x/properties.html
>
> 2. This change can be mentioned in changelog (in subsection "Other").
Sure, I'll correct that.
Best,
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1840784 - in /tomcat/trunk: build.properties.default build.xml
Posted by Konstantin Kolinko <kn...@gmail.com>.
1. The version of Ant is already available as ${ant.version}. There is
no need to call antversion task explicitly to get it.
See built-in properties in Ant Manual
http://ant.apache.org/manual-1.9.x/properties.html
2. This change can be mentioned in changelog (in subsection "Other").
чт, 13 сент. 2018 г. в 10:25, <is...@apache.org>:
>
> Author: isapir
> Date: Thu Sep 13 07:25:26 2018
> New Revision: 1840784
>
> URL: http://svn.apache.org/viewvc?rev=1840784&view=rev
> Log:
> Simplified required Ant version check per BZ 62705
>
> Modified:
> tomcat/trunk/build.properties.default
> tomcat/trunk/build.xml
>
> Modified: tomcat/trunk/build.properties.default
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1840784&r1=1840783&r2=1840784&view=diff
> ==============================================================================
> --- tomcat/trunk/build.properties.default (original)
> +++ tomcat/trunk/build.properties.default Thu Sep 13 07:25:26 2018
> @@ -31,6 +31,7 @@ version.suffix=-dev
>
> # ----- Build control flags -----
> # Note enabling validation uses Checkstyle which is LGPL licensed
> +ant.version.required=1.9.8
> execute.validate=false
> execute.test.nio=true
> execute.test.nio2=true
>
> Modified: tomcat/trunk/build.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840784&r1=1840783&r2=1840784&view=diff
> ==============================================================================
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Thu Sep 13 07:25:26 2018
> @@ -33,6 +33,14 @@
> <property file="build.properties"/>
> <property file="build.properties.default"/>
>
> + <!-- Check Ant Version -->
> + <antversion property="ant.version.running" />
> + <fail message="Ant version ${ant.version.required} or newer is required (version ${ant.version.running} is installed)">
> + <condition>
> + <not><antversion atleast="${ant.version.required}" /></not>
> + </condition>
> + </fail>
> +
> <!-- Project Name -->
> <property name="project" value="apache-tomcat" />
>
> @@ -41,8 +49,6 @@
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org