From 98f6650236b0f97450c287db5b12e5cb655fb5b3 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Wed, 4 Jul 2012 22:03:08 +0100 Subject: [PATCH] added a (currently disabled) test case for compiling the JS code from the kotlin-js-library maven build --- .../jetbrains/jet/cli/js/K2JSCompiler.java | 7 +- .../jet/cli/js/K2JSCompilerArguments.java | 3 + .../CompileMavenGeneratedJSLibrary.java | 122 ++++++++++++++++++ .../LibrarySourceDirectoriesConfig.java | 83 ++++++++++++ 4 files changed, 213 insertions(+), 2 deletions(-) create mode 100644 js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java create mode 100644 js/js.translator/src/org/jetbrains/k2js/config/LibrarySourceDirectoriesConfig.java diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java index e44de3d0763..0cb89d81035 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java @@ -148,10 +148,13 @@ public class K2JSCompiler extends CLICompiler ecmaVersions, + @NotNull String sourceDir, @NotNull String... stdLibFiles) throws Exception { + List files = Lists.newArrayList(); + + + // now lets add all the files from the definitions and library + //addAllSourceFiles(files, generatedJsDefinitionsDir); + addAllSourceFiles(files, generatedJsLibraryDir); + + + File stdlibDir = new File(sourceDir); + assertTrue("Cannot find stdlib test source: " + stdlibDir, stdlibDir.exists()); + for (String file : stdLibFiles) { + files.add(new File(stdlibDir, file).getPath()); + } + + // now lets try invoke the compiler + for (EcmaVersion version : ecmaVersions) { + K2JSCompiler compiler = new K2JSCompiler(); + K2JSCompilerArguments arguments = new K2JSCompilerArguments(); + arguments.outputFile = getOutputFilePath(getTestName(false) + ".compiler.kt", version); + arguments.sourceFiles = files.toArray(new String[files.size()]); + arguments.verbose = true; + arguments.libraryDirectories = 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); + } + } + + private void addAllSourceFiles(List files, File dir) { + File[] children = dir.listFiles(); + if (children != null && children.length > 0) { + for (File child : children) { + if (child.isDirectory()) { + addAllSourceFiles(files, child); + } else { + String name = child.getName(); + if (name.toLowerCase().endsWith(".kt")) { + files.add(child.getParent()); + } + } + } + } + } +} diff --git a/js/js.translator/src/org/jetbrains/k2js/config/LibrarySourceDirectoriesConfig.java b/js/js.translator/src/org/jetbrains/k2js/config/LibrarySourceDirectoriesConfig.java new file mode 100644 index 00000000000..7b10d9a6115 --- /dev/null +++ b/js/js.translator/src/org/jetbrains/k2js/config/LibrarySourceDirectoriesConfig.java @@ -0,0 +1,83 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.k2js.config; + +import com.google.common.collect.Lists; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.k2js.utils.JetFileUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.List; + +public class LibrarySourceDirectoriesConfig extends Config { + @NotNull + protected final String[] directories; + + public LibrarySourceDirectoriesConfig(@NotNull Project project, @NotNull String moduleId, @NotNull String[] directories, @NotNull EcmaVersion ecmaVersion) { + super(project, moduleId, ecmaVersion); + this.directories = directories; + } + + @NotNull + @Override + public List generateLibFiles() { + try { + List results = Lists.newArrayList(); + for (String directory : directories) { + File rootDir = new File(directory); + results.addAll(traverseDirectory(rootDir, rootDir)); + } + return results; + } + catch (IOException e) { + System.out.println("Caught: " + e); + e.printStackTrace(); + return Collections.emptyList(); + } + } + + @NotNull + private List traverseDirectory(@NotNull File rootDir, @NotNull File dir) throws IOException { + File[] files = dir.listFiles(); + File[] children = dir.listFiles(); + List result = Lists.newArrayList(); + if (children != null && children.length > 0) { + for (File child : children) { + if (child.isDirectory()) { + List childFiles = traverseDirectory(rootDir, child); + result.addAll(childFiles); + } + else { + String name = child.getName(); + if (name.toLowerCase().endsWith(".kt")) { + String text = FileUtil.loadFile(child); + //String path = FileUtil.getRelativePath(directoryFile, child); + String path = child.getPath(); + JetFile jfile = JetFileUtils.createPsiFile(path, text, getProject()); + result.add(jfile); + } + } + } + } + return result; + } +}