Author: kkolinko
Date: Sat Feb 15 16:29:07 2014
New Revision: 1568640
URL: http://svn.apache.org/r1568640
Log:
Followup to r1567717
Remove several other uses of compile.optimize property,
the optimize flag is noop for current versions of javac (as Ant manual says).
Provide explicit default for compile.deprecation property.
It controls whether -deprecation flag (a synonym for -Xlint:deprecation) is
passed to javac.
No functional change here, as String->boolean conversion in Ant treats any
value except of "on", "true", "yes" as false (Project.toBoolean()).
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/res/ide-support/netbeans/nb-tomcat.xml
tomcat/trunk/webapps/docs/appdev/build.xml.txt
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1568640&r1=1568639&r2=1568640&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sat Feb 15 16:29:07 2014
@@ -65,6 +65,9 @@ compile.source=1.7
compile.target=1.7
compile.debug=true
+# Do not pass -deprecation (-Xlint:deprecation) flag to javac
+compile.deprecation=false
+
base-apache.loc.1=http://www.apache.org/dist
base-apache.loc.2=http://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1568640&r1=1568639&r2=1568640&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Sat Feb 15 16:29:07
2014
@@ -39,6 +39,9 @@ compile.source=1.7
compile.target=1.7
compile.debug=true
+# Do not pass -deprecation (-Xlint:deprecation) flag to javac
+compile.deprecation=false
+
# ----- Settings for Junit test database.
# Common settings
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1568640&r1=1568639&r2=1568640&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Sat Feb 15 16:29:07 2014
@@ -144,7 +144,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
- optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath refid="tomcat.jdbc.classpath"/>
@@ -181,7 +180,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
- optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath refid="tomcat.jdbc.classpath"/>
Modified: tomcat/trunk/res/ide-support/netbeans/nb-tomcat.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/nb-tomcat.xml?rev=1568640&r1=1568639&r2=1568640&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/nb-tomcat.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat.xml Sat Feb 15 16:29:07 2014
@@ -76,7 +76,6 @@
debug="true"
deprecation="${compile.deprecation}"
source="${compile.source}"
- optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath path="${nb-test.classpath}"/>
Modified: tomcat/trunk/webapps/docs/appdev/build.xml.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/build.xml.txt?rev=1568640&r1=1568639&r2=1568640&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/build.xml.txt (original)
+++ tomcat/trunk/webapps/docs/appdev/build.xml.txt Sat Feb 15 16:29:07 2014
@@ -233,13 +233,10 @@
compile.deprecation Should compilation include the deprecation option?
- compile.optimize Should compilation include the optimize option?
-
-->
<property name="compile.debug" value="true"/>
<property name="compile.deprecation" value="false"/>
- <property name="compile.optimize" value="true"/>
@@ -293,8 +290,7 @@
<javac srcdir="${src.home}"
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ deprecation="${compile.deprecation}">
<classpath refid="compile.classpath"/>
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
