Convert module scripting to .ktm extension.
This commit is contained in:
committed by
Andrey Breslav
parent
98c54f39bb
commit
480dd6767c
@@ -74,7 +74,7 @@ public class CompileEnvironmentUtil {
|
||||
return ModuleChunk.EMPTY;
|
||||
}
|
||||
String extension = FileUtilRt.getExtension(moduleDefinitionFile);
|
||||
if ("kts".equalsIgnoreCase(extension)) {
|
||||
if ("ktm".equalsIgnoreCase(extension)) {
|
||||
return new ModuleChunk(loadModuleScript(paths, moduleDefinitionFile, messageCollector));
|
||||
}
|
||||
if ("xml".equalsIgnoreCase(extension)) {
|
||||
|
||||
@@ -52,7 +52,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase {
|
||||
public void compileAndRunModule() throws Exception {
|
||||
String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "smoke.jar";
|
||||
|
||||
assertEquals("compilation failed", 0, runCompiler("Smoke.compile", "-module", "Smoke.kts", "-jar", jar));
|
||||
assertEquals("compilation failed", 0, runCompiler("Smoke.compile", "-module", "Smoke.ktm", "-jar", jar));
|
||||
runJava("Smoke.run", "-cp", jar + File.pathSeparator + getKotlinRuntimePath(), "Smoke.SmokePackage", "1", "2", "3");
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ public class CompileEnvironmentTest extends TestCase {
|
||||
File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar();
|
||||
File resultJar = new File(tempDir, "result.jar");
|
||||
ExitCode rv = new K2JVMCompiler().exec(System.out,
|
||||
"-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kts",
|
||||
"-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.ktm",
|
||||
"-jar", resultJar.getAbsolutePath(),
|
||||
"-noStdlib",
|
||||
"-classpath", stdlib.getAbsolutePath(),
|
||||
|
||||
@@ -177,7 +177,7 @@ public class K2JvmTranslatingCompiler implements TranslatingCompiler {
|
||||
outputDirectoriesToFilter
|
||||
).asText();
|
||||
|
||||
File scriptFile = new File(outputDir, "script.kts");
|
||||
File scriptFile = new File(outputDir, "script.ktm");
|
||||
try {
|
||||
FileUtil.writeToFile(scriptFile, script.toString());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user