From bef7b5389b5406794f226d2d4c7f9dab7509f15e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 12 Mar 2018 22:17:52 +0300 Subject: [PATCH] Create ir/backend.js module with dummy compiler --- build.gradle.kts | 1 + compiler/ir/backend.js/build.gradle.kts | 22 +++++++++++++++++++ .../kotlin/ir/backend/js/compiler.kt | 16 ++++++++++++++ js/js.tests/build.gradle.kts | 1 + settings.gradle | 2 ++ 5 files changed, 42 insertions(+) create mode 100644 compiler/ir/backend.js/build.gradle.kts create mode 100644 compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt diff --git a/build.gradle.kts b/build.gradle.kts index 26026b206ef..5a163b4f5ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -190,6 +190,7 @@ extra["compilerModules"] = arrayOf( ":compiler:daemon", ":compiler:ir.tree", ":compiler:ir.psi2ir", + ":compiler:backend.js", ":compiler:backend-common", ":compiler:backend", ":compiler:plugin-api", diff --git a/compiler/ir/backend.js/build.gradle.kts b/compiler/ir/backend.js/build.gradle.kts new file mode 100644 index 00000000000..fe35c3eff00 --- /dev/null +++ b/compiler/ir/backend.js/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { kotlin("jvm") } +apply { plugin("jps-compatible") } + +jvmTarget = "1.6" + +dependencies { + compile(project(":compiler:util")) + compile(project(":compiler:frontend")) + compile(project(":compiler:backend-common")) + compile(project(":compiler:ir.tree")) + compile(project(":compiler:ir.psi2ir")) + compile(project(":js:js.ast")) + compile(project(":js:js.frontend")) + + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } +} + +sourceSets { + "main" { projectDefault() } + "test" {} +} + diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt new file mode 100644 index 00000000000..582f301d563 --- /dev/null +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt @@ -0,0 +1,16 @@ +/* + * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.ir.backend.js + +import org.jetbrains.kotlin.psi.KtFile + +// Dummy compile function to work on the test infrastructure +fun compile( + files: List +): String { + if (files.none { it.name == "nestedPackage.kt" }) return "" + return "function box() { return \"OK\"; }" +} \ No newline at end of file diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 2103f0c08aa..0d23dd501d6 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -25,6 +25,7 @@ dependencies { testCompileOnly(project(":compiler:util")) testCompile(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") } + testCompile(project(":compiler:backend.js")) testCompile(project(":js:js.translator")) testCompile(project(":js:js.serializer")) testCompile(project(":js:js.dce")) diff --git a/settings.gradle b/settings.gradle index f8d379eecc4..4c76aacae90 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,6 +32,7 @@ include ":kotlin-build-common", ":compiler:ir.tree", ":compiler:ir.psi2ir", ":compiler:ir.ir2cfg", + ":compiler:backend.js", ":compiler:backend-common", ":compiler:backend", ":compiler:plugin-api", @@ -204,6 +205,7 @@ project(':kotlin-ant').projectDir = "$rootDir/ant" as File project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File project(':compiler:ir.psi2ir').projectDir = "$rootDir/compiler/ir/ir.psi2ir" as File project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as File +project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" as File project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/android-extensions/android-extensions-compiler" as File