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

Generating Java to Kotlin method map along with injectors.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-07 13:43:29 +04:00
parent d349bca42c
commit 1092164684
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+14 -6
View File
@@ -82,20 +82,28 @@
<chmod dir="${kotlin-home}/bin" includes="*" perm="755"/>
</target>
<target name="injectorsGenerator">
<cleandir dir="${output}/classes/injectorsGenerator"/>
<javac destdir="${output}/classes/injectorsGenerator" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
<target name="compileGenerators">
<cleandir dir="${output}/classes/generators"/>
<javac destdir="${output}/classes/generators" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
<src path="injector-generator/src"/>
<src path="generators/org/jetbrains/jet/generators/injectors"/>
<src path="generators/org/jetbrains/jet/generators/jvm"/>
<src refid="compilerSources.path"/>
<classpath refid="classpath"/>
</javac>
<copy todir="${output}/classes/generators">
<fileset dir="compiler/frontend/src" includes="**/*.jet"/>
</copy>
</target>
<target name="generateInjectors" depends="injectorsGenerator">
<target name="invokeGenerators" depends="compileGenerators">
<java classname="org.jetbrains.jet.generators.injectors.GenerateInjectors" failonerror="true">
<classpath refid="classpath"/>
<classpath path="${output}/classes/injectorsGenerator"/>
<classpath path="${output}/classes/generators"/>
</java>
<java classname="org.jetbrains.jet.generators.jvm.GenerateJavaToKotlinMethodMap" failonerror="true">
<classpath refid="classpath"/>
<classpath path="${output}/classes/generators"/>
</java>
</target>
@@ -486,7 +494,7 @@
</target>
<target name="dist"
depends="init,prepareDist,injectorsGenerator,generateInjectors,compiler,compilerSources,antTools,jdkAnnotations,runtime,lang,jslib"/>
depends="init,prepareDist,compileGenerators,invokeGenerators,compiler,compilerSources,antTools,jdkAnnotations,runtime,lang,jslib"/>
<target name="zip" depends="dist">
<zip destfile="${output}/${output.name}.zip">
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMapGenerated.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableMultimap;
import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.*;
/* This file is generated by org.jetbrains.jet.generators.GenerateJavaToKotlinMethodMap. DO NOT EDIT! */
/* This file is generated by org.jetbrains.jet.generators.jvm.GenerateJavaToKotlinMethodMap. DO NOT EDIT! */
@SuppressWarnings("unchecked")
class JavaToKotlinMethodMapGenerated {
final ImmutableMultimap<String, JavaToKotlinMethodMap.ClassData> map;
generators/org/jetbrains/jet/generators/GenerateJavaToKotlinMethodMap.java → generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java
+8 -7
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.generators;
package org.jetbrains.jet.generators.jvm;
import com.google.common.collect.Lists;
import com.intellij.openapi.components.ServiceManager;
@@ -27,11 +27,9 @@ import com.intellij.psi.impl.file.impl.JavaFileManager;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.CompileCompilerDependenciesTest;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.TestJdkKind;
import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
@@ -39,6 +37,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMapBuilder;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.resolve.DescriptorRenderer;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.jet.utils.Printer;
import java.io.File;
@@ -48,6 +47,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY;
import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.serializeFunction;
import static org.jetbrains.jet.lang.resolve.java.JavaToKotlinMethodMap.serializePsiMethod;
@@ -56,9 +56,10 @@ public class GenerateJavaToKotlinMethodMap {
public static final String BUILTINS_FQNAME_PREFIX = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.getFqName() + ".";
public static void main(String[] args) throws IOException {
JetCoreEnvironment coreEnvironment = new JetCoreEnvironment(
CompileEnvironmentUtil.createMockDisposable(),
CompileCompilerDependenciesTest.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK));
CompilerConfiguration configuration = new CompilerConfiguration();
configuration.add(CLASSPATH_KEY, PathUtil.findRtJar());
JetCoreEnvironment coreEnvironment = new JetCoreEnvironment(CompileEnvironmentUtil.createMockDisposable(), configuration);
StringBuilder buf = new StringBuilder();
Printer printer = new Printer(buf);