bodewig 2004/01/30 06:45:40
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Gcj.java
Log:
Merge with HEAD
Revision Changes Path
No revision
No revision
1.503.2.33 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.32
retrieving revision 1.503.2.33
diff -u -r1.503.2.32 -r1.503.2.33
--- WHATSNEW 30 Jan 2004 13:59:43 -0000 1.503.2.32
+++ WHATSNEW 30 Jan 2004 14:45:39 -0000 1.503.2.33
@@ -25,6 +25,9 @@
* <java> ignored the append attribute, Bugzilla Report 26137.
+* The gcj compiler adapter for <javac> failed if the destination
+ directory didn't exist. Bugzilla Report 25856.
+
Other changes:
--------------
No revision
No revision
1.14.2.1 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
Index: Gcj.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- Gcj.java 19 Jul 2003 08:11:01 -0000 1.14
+++ Gcj.java 30 Jan 2004 14:45:39 -0000 1.14.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -119,10 +119,10 @@
cmd.createArgument().setValue("-d");
cmd.createArgument().setFile(destDir);
- if (destDir.mkdirs()) {
+ if (!destDir.exists() && !destDir.mkdirs()) {
throw new BuildException("Can't make output directories. "
+ "Maybe permission is wrong. ");
- };
+ }
}
cmd.createArgument().setValue("-classpath");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
