Drop libraryDirectories CLI option.

This commit is contained in:
Pavel V. Talanov
2012-08-13 18:36:17 +04:00
parent 4320a5fb61
commit 71adfb57db
3 changed files with 3 additions and 7 deletions
@@ -156,9 +156,8 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
String moduleId = FileUtil.getNameWithoutExtension(new File(arguments.outputFile));
if (arguments.libraryFiles != null) {
return new LibrarySourcesConfig(project, moduleId, Arrays.asList(arguments.libraryFiles), ecmaVersion);
} if (arguments.libraryDirectories != null) {
return new LibrarySourceDirectoriesConfig(project, moduleId, arguments.libraryDirectories, ecmaVersion);
} else {
}
else {
// lets discover the JS library definitions on the classpath
return new ClassPathLibraryDefintionsConfig(project, moduleId, ecmaVersion);
}
@@ -37,9 +37,6 @@ public class K2JSCompilerArguments extends CompilerArguments {
@Argument(value = "libraryFiles", description = "Path to zipped lib sources or kotlin files")
public String[] libraryFiles;
@Argument(value = "libraryDirectories", description = "Path to directory containing source kotlin files")
public String[] libraryDirectories;
@Argument(value = "sourceFiles", description = "Source files (dir or file)")
public String[] sourceFiles;
@@ -95,7 +95,7 @@ public class CompileMavenGeneratedJSLibrary extends SingleFileTranslationTest {
arguments.outputFile = getOutputFilePath(getTestName(false) + ".compiler.kt", version);
arguments.sourceFiles = files.toArray(new String[files.size()]);
arguments.verbose = true;
arguments.libraryDirectories = new String[] {generatedJsDefinitionsDir};
arguments.libraryFiles = new String[] {generatedJsDefinitionsDir};
System.out.println("Compiling with version: " + version + " to: " + arguments.outputFile);
ExitCode answer = compiler.exec(System.out, arguments);
assertEquals("Compile failed", ExitCode.OK, answer);