From acc03cb293ed2000f163fc9e231828598c00df6a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 18 Apr 2012 16:01:45 -0400 Subject: [PATCH] implement embedded interface --- .../src/main/java/xsbti/compile/IncrementalCompiler.java | 3 ++- interface/src/main/java/xsbti/compile/Setup.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/interface/src/main/java/xsbti/compile/IncrementalCompiler.java b/interface/src/main/java/xsbti/compile/IncrementalCompiler.java index 9fe301029..f2323111d 100644 --- a/interface/src/main/java/xsbti/compile/IncrementalCompiler.java +++ b/interface/src/main/java/xsbti/compile/IncrementalCompiler.java @@ -52,9 +52,10 @@ public interface IncrementalCompiler * to create a ScalaCompiler for incremental compilation. It is the client's responsibility to manage compiled jars for * different Scala versions. * + * @param label A brief name describing the source component for use in error messages * @param sourceJar The jar file containing the compiler interface sources. These are published as sbt's compiler-interface-src module. * @param targetJar Where to create the output jar file containing the compiled classes. * @param instance The ScalaInstance to compile the compiler interface for. * @param log The logger to use during compilation. */ - void compileInterfaceJar(File sourceJar, File targetJar, ScalaInstance instance, Logger log); + void compileInterfaceJar(String label, File sourceJar, File targetJar, File interfaceJar, ScalaInstance instance, Logger log); } diff --git a/interface/src/main/java/xsbti/compile/Setup.java b/interface/src/main/java/xsbti/compile/Setup.java index ca9999978..a1a9a1ad8 100644 --- a/interface/src/main/java/xsbti/compile/Setup.java +++ b/interface/src/main/java/xsbti/compile/Setup.java @@ -17,8 +17,8 @@ public interface Setup /** If true, no sources are actually compiled and the Analysis from the previous compilation is returned.*/ boolean skip(); - /** The directory used to cache information across compilations. - * This directory can be removed to force a full recompilation. - * The directory should be unique and not shared between compilations. */ - File cacheDirectory(); + /** The file used to cache information across compilations. + * This file can be removed to force a full recompilation. + * The file should be unique and not shared between compilations. */ + File cacheFile(); }