From 8f8b9380601e2e09de0ccbf6ee814fdb1d61ebd4 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 2 Apr 2015 21:35:13 +0300
Subject: [PATCH] Drop module "ktm" scripts and support java source roots in
 "xml" modules

Drop kotlin.modules package from runtime
Move adapted classes into compiler
Unsupport files with "ktm" extension
Delete code for loading module scripts
Drop tests for module scripts
Separate section for java source roots in xml script generator/parser

Original commit: 94cc847c4892b03ab16cdb47d26c72a2b017c751
---
 .../modules/KotlinModuleXmlBuilder.java       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java
index 1584e1a7e34..67844e5ebb9 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java
@@ -67,23 +67,19 @@ public class KotlinModuleXmlBuilder {
             p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>");
         }
 
-        if (!javaSourceRoots.isEmpty()) {
-            processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut);
-        }
-
-        processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut);
+        processJavaSourceRoots(javaSourceRoots);
+        processClasspath(classpathRoots, directoriesToFilterOut);
         processAnnotationRoots(annotationRoots);
 
         closeTag(p, MODULE);
         return this;
     }
 
-    private void processClassPathSection(
-            @NotNull String sectionDescription,
+    private void processClasspath(
             @NotNull Collection<File> files,
             @NotNull Set<File> directoriesToFilterOut
     ) {
-        p.println("<!-- ", sectionDescription, " -->");
+        p.println("<!-- Classpath -->");
         for (File file : files) {
             boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED;
             if (isOutput) {
@@ -111,6 +107,13 @@ public class KotlinModuleXmlBuilder {
         }
     }
 
+    private void processJavaSourceRoots(@NotNull List<File> files) {
+        p.println("<!-- Java source roots -->");
+        for (File file : files) {
+            p.println("<", JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(file), "\"/>");
+        }
+    }
+
     public CharSequence asText() {
         if (!done) {
             closeTag(p, MODULES);