ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r567592 - /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Date Mon, 20 Aug 2007 08:27:33 GMT
Author: peterreilly
Date: Mon Aug 20 01:27:33 2007
New Revision: 567592

URL: http://svn.apache.org/viewvc?rev=567592&view=rev
Log:
sync up Jikes.java (correctly)

Modified:
    ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java

Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java?rev=567592&r1=567591&r2=567592&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
(original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Mon Aug 20 01:27:33 2007
@@ -15,7 +15,6 @@
  *  limitations under the License.
  *
  */
-
 package org.apache.tools.ant.taskdefs.compilers;
 
 import org.apache.tools.ant.BuildException;
@@ -186,13 +185,11 @@
          * that don't exist. As this is often the case, these
          * warning can be pretty annoying.
          */
-        String warningsProperty =
-            project.getProperty("build.compiler.warnings");
+        String warningsProperty = project.getProperty("build.compiler.warnings");
         if (warningsProperty != null) {
-            attributes.log("!! the build.compiler.warnings property is "
-                           + "deprecated. !!", Project.MSG_WARN);
-            attributes.log("!! Use the nowarn attribute instead. !!",
-                           Project.MSG_WARN);
+            attributes.log("!! the build.compiler.warnings property is " + "deprecated. !!",
+                    Project.MSG_WARN);
+            attributes.log("!! Use the nowarn attribute instead. !!", Project.MSG_WARN);
             if (!Project.toBoolean(warningsProperty)) {
                 cmd.createArgument().setValue("-nowarn");
             }
@@ -204,8 +201,7 @@
         /**
          * Jikes can issue pedantic warnings.
          */
-        String pedanticProperty =
-            project.getProperty("build.compiler.pedantic");
+        String pedanticProperty = project.getProperty("build.compiler.pedantic");
         if (pedanticProperty != null && Project.toBoolean(pedanticProperty)) {
             cmd.createArgument().setValue("+P");
         }
@@ -215,42 +211,11 @@
          * checking", see the jikes documentation for differences
          * between -depend and +F.
          */
-        String fullDependProperty =
-            project.getProperty("build.compiler.fulldepend");
+        String fullDependProperty = project.getProperty("build.compiler.fulldepend");
         if (fullDependProperty != null
             && Project.toBoolean(fullDependProperty)) {
             cmd.createArgument().setValue("+F");
         }
-
-        if (attributes.getSource() != null) {
-            cmd.createArgument().setValue("-source");
-            String source = attributes.getSource();
-            if (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, Jikes doesn't like it
-                attributes.log("Jikes doesn't support '-source "
-                               + source + "', will use '-source 1.3' instead");
-                cmd.createArgument().setValue("1.3");
-            } else {
-                cmd.createArgument().setValue(source);
-            }
-        }
-
-        addCurrentCompilerArgs(cmd);
-
-        int firstFileName = cmd.size();
-
-        Path boot = getBootClassPath();
-        if (boot.size() > 0) {
-            cmd.createArgument().setValue("-bootclasspath");
-            cmd.createArgument().setPath(boot);
-        }
-
-        logAndAddFilesToCompile(cmd);
-
-        return
-            executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
     }
-
 
 }



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


Mime
View raw message