Here are the patches again including fixed patch for build.xml.
- tom
[EMAIL PROTECTED] wrote:
> Thomas Haas wrote:
> >The implicit copying of files by javac annoys me. I thought I have read
> >once on this list, that this behaviour will be removed. It is still
> >present in the latest CVS version of ANT.
>
> It annoys me too.
>
> There is agreement to delete it, but I would like to have a chance to fix
> all the jakarta.apache.org and xml.apache.org build.xml files before making
> this fix.
>
> - Sam Ruby
--
* Thomas Haas <mailto:[EMAIL PROTECTED]>
* SoftWired AG <http://www.softwired-inc.com/>
* Technoparkstr. 1 *** CH-8005 Zurich *** +41-1-4452370
--- Javac.java.orig Wed Mar 22 21:18:36 2000
+++ Javac.java Wed Mar 22 21:20:02 2000
@@ -92,7 +92,6 @@
private boolean debug = false;
private boolean optimize = false;
private boolean deprecation = false;
- private boolean filtering = false;
private String target;
private String bootclasspath;
private String extdirs;
@@ -168,13 +167,6 @@
}
/**
- * Set the filtering flag.
- */
- public void setFiltering(String filter) {
- filtering = Project.toBoolean(filter);
- }
-
- /**
* Executes the task.
*/
public void execute() throws BuildException {
@@ -225,25 +217,6 @@
throw new BuildException(msg);
}
}
-
- // copy the support files
-
- if (filecopyList.size() > 0) {
- project.log("Copying " + filecopyList.size() +
- " support files to " + destDir.getAbsolutePath());
- Enumeration enum = filecopyList.keys();
- while (enum.hasMoreElements()) {
- String fromFile = (String) enum.nextElement();
- String toFile = (String) filecopyList.get(fromFile);
- try {
- project.copyFile(fromFile, toFile, filtering);
- } catch (IOException ioe) {
- String msg = "Failed to copy " + fromFile + " to " + toFile
- + " due to " + ioe.getMessage();
- throw new BuildException(msg);
- }
- }
- }
}
/**
@@ -267,7 +240,7 @@
+ ".class");
if (srcFile.lastModified() > now) {
- project.log("Warning: file modified in the future: " +
+ project.log("Warning: file modified in the future: " +
files[i], project.MSG_WARN);
}
--- index.html.orig Wed Mar 22 05:20:50 2000
+++ index.html Wed Mar 22 21:25:10 2000
@@ -1246,12 +1246,9 @@
<p>The source and destination directory will be recursively scanned for Java
source files to compile. Only Java files that have no corresponding class file
or where the class file is older than the java file will be compiled.</p>
-<p>Files in the source tree, that are no java files, are copied to the
-destination directory, allowing support files to be located properly in the
-classpath.</p>
<p>The directory structure of the source tree should follow the package
hierarchy.</p>
-<p>It is possible to refine the set of files that are being compiled/copied.
+<p>It is possible to refine the set of files that are being compiled.
This can be done with the <i>includes</i>, <i>excludes</i> and
<i>defaultexcludes</i>
attributes. With the <i>includes</i> attribute you specify the files you want
to
have included by using patterns. The <i>exclude</i> attribute is used to
specify
@@ -1338,11 +1335,6 @@
<td valign="top">indicates whether there should be compiled with
deprecation
information ("on").</td>
<td align="center" valign="top">No</td>
- </tr>
- <tr>
- <td valign="top">filtering</td>
- <td valign="top">indicates whether token filtering should take place</td>
- <td valign="top" align="center">No</td>
</tr>
</table>
<h3>Examples</h3>
--- build.xml.orig Wed Mar 22 21:42:10 2000
+++ build.xml Wed Mar 22 21:44:58 2000
@@ -57,6 +57,10 @@
<exclude name="**/Script.java" unless="bsf.present" />
<exclude name="**/NetRexxC.java" unless="netrexx.present" />
</javac>
+ <copydir src="${src.dir}"
+ dest="${build.classes}"
+ includes="**/*.properties,org/apache/tools/ant/defaultManifest.mf"
+ />
</target>
<!-- =================================================================== -->
