From 0e1fc0cff24fbbf6972a865bf584f0b453d398e8 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 24 Mar 2017 04:41:56 +0300
Subject: [PATCH] Rewrite preprocessor task in gradle without ant

---
 libraries/build.gradle               | 10 +++++++++-
 libraries/stdlib/common/build.gradle |  9 ++-------
 libraries/stdlib/common/tasks.xml    | 20 --------------------
 libraries/stdlib/js/build.gradle     |  9 ++-------
 4 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 libraries/stdlib/common/tasks.xml

diff --git a/libraries/build.gradle b/libraries/build.gradle
index 9df2274122b..edf2ecda098 100644
--- a/libraries/build.gradle
+++ b/libraries/build.gradle
@@ -15,7 +15,6 @@ ext.JDK_16 = System.getenv("JDK_16")
 ext.JDK_17 = System.getenv("JDK_17")
 ext.JDK_18 = System.getenv("JDK_18")
 ext.bootstrapCompilerFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar")
-ext.compilerPreloaderFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-preloader.jar")
 
 allprojects  {
     group = 'org.jetbrains.kotlin'
@@ -122,3 +121,12 @@ static def manifestAttributes(Manifest manifest, Project project, String compone
     }
 }
 
+def createPreprocessorTask(Project project, def name, def sourceDir, def targetDir, def profile = "JS") {
+    return project.tasks.create("preprocessSources$name", JavaExec) {
+        inputs.dir(sourceDir)
+        outputs.dir(targetDir)
+        classpath = project.files(bootstrapCompilerFile)
+        main = "org.jetbrains.kotlin.preprocessor.PreprocessorCLI"
+        args = [sourceDir, targetDir, profile]
+    }
+}
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index cc5a6921a7a..c467ac5ae18 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -13,14 +13,9 @@ sourceSets {
     }
 }
 
-ant.properties.baseDir = projectDir
-ant.properties.commonSrcDir = commonSrcDir
-ant.properties.kotlinCompiler = bootstrapCompilerFile.path
-ant.properties.compilerPreloader = compilerPreloaderFile.path
+createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
 
-ant.importBuild('tasks.xml')
-
-compileKotlinCommon.dependsOn commonSources
+compileKotlinCommon.dependsOn preprocessSourcesMain
 
 /*
 // TODO: currently unsupported
diff --git a/libraries/stdlib/common/tasks.xml b/libraries/stdlib/common/tasks.xml
deleted file mode 100644
index d587c9e36ba..00000000000
--- a/libraries/stdlib/common/tasks.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project>
-    <target name="commonSources">
-        <delete dir="${commonSrcDir}" failonerror="false"/>
-        <mkdir dir="${commonSrcDir}"/>
-        <java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true">
-            <classpath>
-                <pathelement location="${compilerPreloader}"/>
-            </classpath>
-            <assertions>
-                <enable/>
-            </assertions>
-            <arg value="-cp"/>
-            <arg value="${kotlinCompiler}"/>
-            <arg value="org.jetbrains.kotlin.preprocessor.PreprocessorCLI"/>
-            <arg value="${basedir}/../src/kotlin"/>
-            <arg value="${commonSrcDir}"/>
-            <arg value="JS"/>
-        </java>
-    </target>
-</project>
\ No newline at end of file
diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index c33a2da5265..07301dce817 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -60,12 +60,7 @@ sourceSets {
     }
 }
 
-ant.properties.baseDir = projectDir
-ant.properties.commonSrcDir = commonSrcDir
-ant.properties.kotlinCompiler = bootstrapCompilerFile.path
-ant.properties.compilerPreloader = compilerPreloaderFile.path
-
-ant.importBuild('../common/tasks.xml')
+createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
 
 kotlin.experimental.coroutines "enable"
 
@@ -88,7 +83,7 @@ compileBuiltinsKotlin2Js {
 }
 
 compileKotlin2Js {
-    dependsOn commonSources
+    dependsOn preprocessSourcesMain
     kotlinOptions {
         outputFile = "${buildDir}/classes/main/kotlin.js"
     }