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 DefaultCompilerAdapter.java
Date Wed, 26 Jan 2005 15:11:26 GMT
bodewig     2005/01/26 07:11:26

  Modified:    src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
  Log:
  let's hope 1.6 will support -source 1.1
  
  Revision  Changes    Path
  1.58      +3 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- DefaultCompilerAdapter.java	26 Jan 2005 15:09:18 -0000	1.57
  +++ DefaultCompilerAdapter.java	26 Jan 2005 15:11:26 -0000	1.58
  @@ -314,7 +314,8 @@
           if (attributes.getSource() != null && !assumeJava13()) {
               cmd.createArgument().setValue("-source");
               String source = attributes.getSource();
  -            if (source.equals("1.1") || source.equals("1.2")) {
  +            if ((assumeJava14() || assumeJava15())
  +                && (source.equals("1.1") || source.equals("1.2"))) {
                   // support for -source 1.1 and -source 1.2 has been
                   // added with JDK 1.4.2 - and isn't present in 1.5.0 either
                   cmd.createArgument().setValue("1.3");
  @@ -328,7 +329,7 @@
                   String s = t;
                   if (t.equals("1.1")) {
                       // 1.5.0 doesn't support -source 1.1
  -                    s = "1.3";
  +                    s = "1.2";
                   }
                   attributes.log("", Project.MSG_WARN);
                   attributes.log("          WARNING", Project.MSG_WARN);
  
  
  

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


Mime
View raw message