You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2004/01/30 15:44:38 UTC

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java

bodewig     2004/01/30 06:44:38

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
  Log:
  The gcj compiler adapter failed if the destdir didn't exist.
  
  PR: 25856
  
  Revision  Changes    Path
  1.534     +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.533
  retrieving revision 1.534
  diff -u -r1.533 -r1.534
  --- WHATSNEW	30 Jan 2004 13:58:58 -0000	1.533
  +++ WHATSNEW	30 Jan 2004 14:44:38 -0000	1.534
  @@ -28,6 +28,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:
   --------------
   * Translate task logs a debug message specifying the number of files
  
  
  
  1.15      +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.15
  diff -u -r1.14 -r1.15
  --- Gcj.java	19 Jul 2003 08:11:01 -0000	1.14
  +++ Gcj.java	30 Jan 2004 14:44:38 -0000	1.15
  @@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org