Merge pull request #10034 from tamasvajk/kotlin-build-versions-2

Kotlin: Change handling of version variants in build script

Author: tamasvajk

java/kotlin-extractor/build.gradle

@@ -27,16 +27,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
 sourceSets {
     main {
         kotlin {
-            // change the excludes for building with other versions:
+            // change the excludes for building with other versions.
+            // Currently 1.7.0 is configured:
             excludes = [
                     "utils/versions/v_1_4_32/*.kt",
-                    "utils/versions/v_1_5_0/*.kt",
-                    "utils/versions/v_1_5_10/*.kt",
-                    "utils/versions/v_1_5_21/*.kt",
-                    "utils/versions/v_1_5_31/*.kt",
-                    "utils/versions/v_1_6_10/*.kt",
-                    "utils/versions/v_1_6_20/*.kt",
-                    // "utils/versions/v_1_7_0/*.kt",
+                    "utils/versions/v_1_5_21/Descriptors.kt",
+                    "utils/versions/v_1_6_10/Descriptors.kt",
             ]
         }
     }

java/kotlin-extractor/build.py

@@ -11,6 +11,8 @@
 import os.path
 import sys
 import shlex
+import distutils
+from distutils import dir_util
 
 
 def parse_args():
@@ -37,10 +39,11 @@ def is_windows():
         return True
     return False
 
+
 # kotlinc might be kotlinc.bat or kotlinc.cmd on Windows, so we use `which` to find out what it is
 kotlinc = shutil.which('kotlinc')
 if kotlinc is None:
-    print("Cannot build the Kotlin extractor: no kotlinc found on your PATH", file = sys.stderr)
+    print("Cannot build the Kotlin extractor: no kotlinc found on your PATH", file=sys.stderr)
     sys.exit(1)
 
 javac = 'javac'
@@ -166,7 +169,7 @@ def transform_to_embeddable(srcs):
             f.write(content)
 
 
-def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output, build_dir, version):
+def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output, build_dir, current_version):
     classpath = patterns_to_classpath(dependency_folder, jars)
     java_classpath = patterns_to_classpath(dependency_folder, java_jars)
 
@@ -176,9 +179,29 @@ def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output,
         shutil.rmtree(tmp_src_dir)
     shutil.copytree('src', tmp_src_dir)
 
-    for v in kotlin_plugin_versions.many_versions:
-        if v != version:
-            d = tmp_src_dir + '/main/kotlin/utils/versions/v_' + v.replace('.', '_')
+    include_version_folder = tmp_src_dir + '/main/kotlin/utils/versions/to_include'
+    os.makedirs(include_version_folder)
+
+    parsed_current_version = kotlin_plugin_versions.version_string_to_tuple(
+        current_version)
+
+    for version in kotlin_plugin_versions.many_versions:
+        parsed_version = kotlin_plugin_versions.version_string_to_tuple(
+            version)
+        if parsed_version[0] < parsed_current_version[0] or \
+            (parsed_version[0] == parsed_current_version[0] and parsed_version[1] < parsed_current_version[1]) or \
+                (parsed_version[0] == parsed_current_version[0] and parsed_version[1] == parsed_current_version[1] and parsed_version[2] <= parsed_current_version[2]):
+            d = tmp_src_dir + '/main/kotlin/utils/versions/v_' + \
+                version.replace('.', '_')
+            if os.path.exists(d):
+                # copy and overwrite files from the version folder to the include folder
+                distutils.dir_util.copy_tree(d, include_version_folder)
+
+    # remove all version folders:
+    for version in kotlin_plugin_versions.many_versions:
+        d = tmp_src_dir + '/main/kotlin/utils/versions/v_' + \
+            version.replace('.', '_')
+        if os.path.exists(d):
             shutil.rmtree(d)
 
     srcs = find_sources(tmp_src_dir)
@@ -209,6 +232,7 @@ def compile_standalone(version):
             'build_standalone_' + version,
             version)
 
+
 if args.single_version:
     compile_standalone(args.single_version)
 elif args.many:

java/kotlin-extractor/kotlin_plugin_versions.py

@@ -21,6 +21,10 @@ def version_string_to_tuple(version):
     m = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)(.*)', version)
     return tuple([int(m.group(i)) for i in range(1, 4)] + [m.group(4)])
 
+# Version number used by CI. It needs to be one of the versions in many_versions.
+ci_version = '1.7.0'
+
+# Version numbers in the list need to be in semantically increasing order
 many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.21', '1.5.31', '1.6.10', '1.6.20', '1.7.0' ]
 
 many_versions_tuples = [version_string_to_tuple(v) for v in many_versions]
@@ -53,8 +57,9 @@ def get_single_version(fakeVersionOutput = None):
     raise Exception(f'No suitable kotlinc version found for {current_version} (got {versionOutput}; know about {str(many_versions)})')
 
 def get_latest_url():
-    version = many_versions[-1]
-    url = 'https://github.com/JetBrains/kotlin/releases/download/v' + version + '/kotlin-compiler-' + version + '.zip'
+    if ci_version not in many_versions:
+        raise Exception('CI version must be one of many_versions')
+    url = 'https://github.com/JetBrains/kotlin/releases/download/v' + ci_version + '/kotlin-compiler-' + ci_version + '.zip'
     return url
 
 if __name__ == "__main__":