ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
Date Wed, 27 Apr 2005 09:51:01 GMT
bodewig     2005/04/27 02:51:01

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/compilers Tag:
                        ANT_16_BRANCH Gcj.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.220 +6 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.219
  retrieving revision 1.503.2.220
  diff -u -r1.503.2.219 -r1.503.2.220
  --- WHATSNEW	25 Apr 2005 10:16:01 -0000	1.503.2.219
  +++ WHATSNEW	27 Apr 2005 09:51:00 -0000	1.503.2.220
  @@ -4,6 +4,12 @@
   Changes that could break older environments:
   --------------------------------------------
   
  +* The gcj compiler adapter used to include the Java runtime classes
  +  even if includeJavaRuntime was set to false, unless the
  +  bootclasspath has been specified as well.  It will now always adhere
  +  to includeJavaRuntime, you may need to set it to true explicitly now
  +  if you relied on the old behavior.
  +
   Other changes:
   --------------
   
  
  
  
  No                   revision
  No                   revision
  1.14.2.7  +5 -9      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.2.6
  retrieving revision 1.14.2.7
  diff -u -r1.14.2.6 -r1.14.2.7
  --- Gcj.java	13 Apr 2004 11:40:18 -0000	1.14.2.6
  +++ Gcj.java	27 Apr 2005 09:51:01 -0000	1.14.2.7
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2004 The Apache Software Foundation
  + * Copyright  2001-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -60,10 +60,6 @@
           // so we'll emulate it for compatibility and convenience.
           classpath.addExtdirs(extdirs);
   
  -        if (bootclasspath == null || bootclasspath.size() == 0) {
  -            // no bootclasspath, therefore, get one from the java runtime
  -            includeJavaRuntime = true;
  -        }
           classpath.append(getCompileClasspath());
   
           // Gcj has no option for source-path so we
  @@ -122,10 +118,10 @@
       public boolean isNativeBuild() {
           boolean nativeBuild = false;
           String[] additionalArguments = getJavac().getCurrentCompilerArgs();
  -        int argsLength=0;
  +        int argsLength = 0;
           while (!nativeBuild && argsLength < additionalArguments.length) {
               int conflictLength = 0;
  -            while (!nativeBuild 
  +            while (!nativeBuild
                      && conflictLength < CONFLICT_WITH_DASH_C.length) {
                   nativeBuild = (additionalArguments[argsLength].startsWith
                                  (CONFLICT_WITH_DASH_C[conflictLength]));
  @@ -136,8 +132,8 @@
           return nativeBuild;
       }
   
  -    private static final String [] CONFLICT_WITH_DASH_C = { 
  -        "-o" , "--main=", "-D", "-fjni", "-L" 
  +    private static final String [] CONFLICT_WITH_DASH_C = {
  +        "-o" , "--main=", "-D", "-fjni", "-L"
       };
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message