azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert module scripting to .ktm extension.

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2014-03-19 13:55:33 +04:00
committed by Andrey Breslav
parent 98c54f39bb
commit 480dd6767c
6 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class CompileEnvironmentUtil {
return ModuleChunk.EMPTY; return ModuleChunk.EMPTY;
} }
String extension = FileUtilRt.getExtension(moduleDefinitionFile); String extension = FileUtilRt.getExtension(moduleDefinitionFile);
if ("kts".equalsIgnoreCase(extension)) { if ("ktm".equalsIgnoreCase(extension)) {
return new ModuleChunk(loadModuleScript(paths, moduleDefinitionFile, messageCollector)); return new ModuleChunk(loadModuleScript(paths, moduleDefinitionFile, messageCollector));
} }
if ("xml".equalsIgnoreCase(extension)) { if ("xml".equalsIgnoreCase(extension)) {
compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase {
public void compileAndRunModule() throws Exception { public void compileAndRunModule() throws Exception {
String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "smoke.jar"; 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"); runJava("Smoke.run", "-cp", jar + File.pathSeparator + getKotlinRuntimePath(), "Smoke.SmokePackage", "1", "2", "3");
} }
compiler/integration-tests/testData/compileAndRunModule/Smoke.kts → compiler/integration-tests/testData/compileAndRunModule/Smoke.ktm
View File
compiler/testData/compiler/smoke/Smoke.kts → compiler/testData/compiler/smoke/Smoke.ktm
View File
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class CompileEnvironmentTest extends TestCase {
File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar(); File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar();
File resultJar = new File(tempDir, "result.jar"); File resultJar = new File(tempDir, "result.jar");
ExitCode rv = new K2JVMCompiler().exec(System.out, ExitCode rv = new K2JVMCompiler().exec(System.out,
"-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kts", "-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.ktm",
"-jar", resultJar.getAbsolutePath(), "-jar", resultJar.getAbsolutePath(),
"-noStdlib", "-noStdlib",
"-classpath", stdlib.getAbsolutePath(), "-classpath", stdlib.getAbsolutePath(),
idea/src/org/jetbrains/jet/plugin/compiler/K2JvmTranslatingCompiler.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class K2JvmTranslatingCompiler implements TranslatingCompiler {
outputDirectoriesToFilter outputDirectoriesToFilter
).asText(); ).asText();
File scriptFile = new File(outputDir, "script.kts"); File scriptFile = new File(outputDir, "script.ktm");
try { try {
FileUtil.writeToFile(scriptFile, script.toString()); FileUtil.writeToFile(scriptFile, script.toString());
} }