Author: chatellier Date: 2010-02-04 14:31:25 +0000 (Thu, 04 Feb 2010) New Revision: 2978 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Use provided compiler only if system compiler can't be found Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2010-02-04 11:24:41 UTC (rev 2977) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2010-02-04 14:31:25 UTC (rev 2978) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -50,6 +50,7 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -216,10 +217,16 @@ protected static int compile(List<File> classpath, Collection<File> src, File dest, PrintWriter out) { dest.mkdirs(); - + int result = -1000; try { - JavaCompiler compiler = JavacTool.create(); + + // look for best available Java compiler (if none, use provided) + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + if (compiler == null) { + compiler = JavacTool.create(); + } + // Use system compiler // JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler