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

K2JS: get rid of MetaInfServices

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-28 17:04:05 +03:00
parent 73db22ae20
commit 44e7af7f65
4 changed files with 1 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+1 -11
View File
@@ -97,10 +97,6 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
Project project = environmentForJS.getProject();
List<JetFile> sourcesFiles = environmentForJS.getSourceFiles();
ClassPathLibrarySourcesLoader sourceLoader = new ClassPathLibrarySourcesLoader(project);
List<JetFile> additionalSourceFiles = sourceLoader.findSourceFiles();
sourcesFiles.addAll(additionalSourceFiles);
if (arguments.verbose) {
reportCompiledSourcesList(messageCollector, sourcesFiles);
}
@@ -222,13 +218,7 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
ContainerUtil.addAllNotNull(libraryFiles, arguments.libraryFiles);
}
if (!libraryFiles.isEmpty()) {
return new LibrarySourcesConfig(project, moduleId, libraryFiles, ecmaVersion, arguments.sourceMap, inlineEnabled);
}
else {
// lets discover the JS library definitions on the classpath
return new ClassPathLibraryDefintionsConfig(project, moduleId, ecmaVersion, arguments.sourceMap, inlineEnabled);
}
return new LibrarySourcesConfig(project, moduleId, libraryFiles, ecmaVersion, arguments.sourceMap, inlineEnabled);
}
public static MainCallParameters createMainCallParameters(String main) {
js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibraryDefintionsConfig.java
-48
View File
@@ -1,48 +0,0 @@
/*
* Copyright 2010-2013 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.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import java.util.List;
/**
* A Config implementation which is configured with a directory to find the standard library names from
*/
public class ClassPathLibraryDefintionsConfig extends Config {
// used by maven build
@NotNull
public static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.libraryDefinitions";
public ClassPathLibraryDefintionsConfig(
@NotNull Project project,
@NotNull String moduleId,
@NotNull EcmaVersion version,
boolean sourcemap,
boolean inlineEnabled
) {
super(project, moduleId, version, sourcemap, inlineEnabled);
}
@NotNull
@Override
public List<JetFile> generateLibFiles() {
return MetaInfServices.loadServicesFiles(META_INF_SERVICES_FILE, getProject());
}
}
js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibrarySourcesLoader.java
-44
View File
@@ -1,44 +0,0 @@
/*
* Copyright 2010-2013 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.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import java.util.List;
/**
* A helper class to load the kotlin library sources to be compiled to JavaScript as part of a JavaScript build
*/
public class ClassPathLibrarySourcesLoader {
// used by maven build
@NotNull
public static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.librarySource";
@NotNull
private final Project project;
public ClassPathLibrarySourcesLoader(@NotNull Project project) {
this.project = project;
}
@NotNull
public List<JetFile> findSourceFiles() {
return MetaInfServices.loadServicesFiles(META_INF_SERVICES_FILE, project);
}
}
js/js.translator/src/org/jetbrains/k2js/config/MetaInfServices.java
-102
View File
@@ -1,102 +0,0 @@
/*
* Copyright 2010-2013 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.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.*;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
/**
* A helper class to discover a META-INF/services file on the classpath and load the files referenced inside it
*/
public final class MetaInfServices {
private MetaInfServices() {
}
public static List<JetFile> loadServicesFiles(@NotNull String metaInfServicesFile, @NotNull Project project) {
List<JetFile> libFiles = new ArrayList<JetFile>();
Set<URL> urlsLoaded = new HashSet<URL>();
try {
Enumeration<URL> resources = MetaInfServices.class.getClassLoader().getResources(metaInfServicesFile);
loadLibFiles(resources, urlsLoaded, libFiles, project);
resources = Thread.currentThread().getContextClassLoader().getResources(metaInfServicesFile);
loadLibFiles(resources, urlsLoaded, libFiles, project);
}
catch (IOException e) {
throw new IllegalStateException(e);
}
return libFiles;
}
private static void loadLibFiles(@NotNull Enumeration<URL> resources,
@NotNull Set<URL> urlsLoaded,
@NotNull List<JetFile> libFiles,
@NotNull Project project)
throws IOException {
while (resources.hasMoreElements()) {
URL url = resources.nextElement();
if (url != null) {
if (urlsLoaded.add(url)) {
BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
try {
while (true) {
String line = reader.readLine();
if (line == null) {
break;
}
else {
line = line.trim();
if (line.length() == 0 || line.startsWith("#")) continue;
// lets try to discover the file
InputStream stream = loadClasspathResource(line);
if (stream != null) {
String text = StringUtil.convertLineSeparators(FileUtil.loadTextAndClose(stream));
libFiles.add(JetPsiFactory(project).createFile(line, text));
}
}
}
}
finally {
reader.close();
}
}
}
}
}
/**
* Tries to load the given resource name on the classpath
*/
public static InputStream loadClasspathResource(String resourceName) {
InputStream answer = ClassPathLibraryDefintionsConfig.class.getClassLoader().getResourceAsStream(resourceName);
if (answer == null) {
answer = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceName);
}
return answer;
}
}