Author: cutting
Date: Thu Dec 1 10:24:07 2005
New Revision: 350294
URL: http://svn.apache.org/viewcvs?rev=350294&view=rev
Log:
Always specify java source & target versions to javac. From Michael Stack.
Modified:
lucene/nutch/branches/mapred/build.xml
lucene/nutch/branches/mapred/default.properties
lucene/nutch/branches/mapred/src/plugin/build-plugin.xml
Modified: lucene/nutch/branches/mapred/build.xml
URL:
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/build.xml?rev=350294&r1=350293&r2=350294&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/build.xml (original)
+++ lucene/nutch/branches/mapred/build.xml Thu Dec 1 10:24:07 2005
@@ -70,9 +70,11 @@
srcdir="${src.dir}"
includes="org/apache/nutch/**/*.java"
destdir="${build.classes}"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="${deprecation}">
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ target="${javac.version}"
+ source="${javac.version}"
+ deprecation="${javac.deprecation}">
<classpath refid="classpath"/>
</javac>
</target>
@@ -154,8 +156,11 @@
srcdir="${test.src.dir}"
includes="org/apache/nutch/**/*.java"
destdir="${test.build.classes}"
- debug="${debug}"
- deprecation="${deprecation}">
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ target="${javac.version}"
+ source="${javac.version}"
+ deprecation="${javac.deprecation}">
<classpath refid="test.classpath"/>
</javac>
</target>
Modified: lucene/nutch/branches/mapred/default.properties
URL:
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/default.properties?rev=350294&r1=350293&r2=350294&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/default.properties (original)
+++ lucene/nutch/branches/mapred/default.properties Thu Dec 1 10:24:07 2005
@@ -38,9 +38,10 @@
dist.dir=${build.dir}/${final.name}
-debug=on
-optimize=on
-deprecation=off
+javac.debug=on
+javac.optimize=on
+javac.deprecation=off
+javac.version= 1.4
plugin.http=org.apache.nutch.protocol.http*
plugin.httpclient=org.apache.nutch.protocol.httpclient*
Modified: lucene/nutch/branches/mapred/src/plugin/build-plugin.xml
URL:
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/plugin/build-plugin.xml?rev=350294&r1=350293&r2=350294&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/plugin/build-plugin.xml (original)
+++ lucene/nutch/branches/mapred/src/plugin/build-plugin.xml Thu Dec 1
10:24:07 2005
@@ -7,8 +7,7 @@
<property name="name" value="${ant.project.name}"/>
<property name="root" value="${basedir}"/>
- <!-- Load all the default properties, and any the user wants -->
- <!-- to contribute (without having to type -D or edit this file -->
+ <!-- load plugin-specific properties first -->
<property file="${user.home}/${name}.build.properties" />
<property file="${root}/build.properties" />
@@ -27,13 +26,8 @@
<property name="deploy.dir" location="${nutch.root}/build/plugins/${name}"/>
- <property name="javac.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
-
- <property name="javadoc.link"
- value="http://java.sun.com/j2se/1.4/docs/api/"/>
-
- <property name="build.encoding" value="ISO-8859-1"/>
+ <!-- load nutch defaults last so that they can be overridden above -->
+ <property file="${nutch.root}/default.properties" />
<path id="plugin.deps"/>
@@ -85,6 +79,9 @@
includes="**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ target="${javac.version}"
+ source="${javac.version}"
deprecation="${javac.deprecation}">
<classpath refid="classpath"/>
</javac>
@@ -126,7 +123,11 @@
srcdir="${src.test}"
includes="**/*.java"
destdir="${build.test}"
- debug="${debug}">
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ target="${javac.version}"
+ source="${javac.version}"
+ deprecation="${javac.deprecation}">
<classpath refid="test.classpath"/>
</javac>
</target>
