azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a (currently disabled) test case for compiling the JS code from the kotlin-js-library maven build

Browse Source
This commit is contained in:
James Strachan
2012-07-04 22:03:08 +01:00
parent c2ca06a8cf
commit 98f6650236
4 changed files with 213 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+5 -2
View File
@@ -148,10 +148,13 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments, K2JSCompile
private static Config getConfig(@NotNull K2JSCompilerArguments arguments, @NotNull Project project) {
EcmaVersion ecmaVersion = EcmaVersion.fromString(arguments.target);
String moduleId = FileUtil.getNameWithoutExtension(new File(arguments.outputFile));
if (arguments.libraryFiles == null) {
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 {
// lets discover the JS library definitions on the classpath
return new ClassPathLibraryDefintionsConfig(project, moduleId, ecmaVersion);
}
return new LibrarySourcesConfig(project, moduleId, Arrays.asList(arguments.libraryFiles), ecmaVersion);
}
}
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java
+3
View File
@@ -37,6 +37,9 @@ 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;