bodewig 01/08/01 02:37:27
Modified: src/main/org/apache/tools/ant/taskdefs Rmic.java
Log:
Don't delete generated files if sourcebase and basedir happen to be
the same.
PR: 2943
Revision Changes Path
1.25 +6 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Rmic.java 2001/07/04 10:04:17 1.24
+++ Rmic.java 2001/08/01 09:37:27 1.25
@@ -399,8 +399,12 @@
}
}
- // Move the generated source file to the base directory
- if (null != sourceBase) {
+ /*
+ * Move the generated source file to the base directory. If
+ * base directory and sourcebase are the same, the generated
+ * sources are already in place.
+ */
+ if (null != sourceBase && !baseDir.equals(sourceBase)) {
if (idl) {
log("Cannot determine sourcefiles in idl mode, ",
Project.MSG_WARN);
