Merge pull request #2427 from lf-lang/fix-ts-windows2

File extension of TypeScript launch script adjusted on Windows
lf-lang · Oct 16, 2024 · b76c063 · b76c063
2 parents 26674cf + 54612a2
commit b76c063
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSFileConfig.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSFileConfig.kt
@@ -27,6 +27,7 @@ package org.lflang.generator.ts
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.FileConfig
+import org.lflang.generator.GeneratorUtils
 import org.lflang.util.FileUtil
 import org.lflang.util.LFCommand
 import java.io.IOException
@@ -53,4 +54,8 @@ class TSFileConfig(
         super.doClean()
         FileUtil.deleteDirectory(srcGenPath)
     }
+
+    override fun getExecutableExtension(): String {
+        return if (GeneratorUtils.isHostWindows()) ".bat" else ""
+    }
 }
diff --git a/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt b/core/src/main/kotlin/org/lflang/generator/ts/TSGenerator.kt
@@ -451,7 +451,7 @@ class TSGenerator(
             context.unsuccessfulFinish()
         } else {
             context.finish(GeneratorResult.Status.COMPILED, codeMaps)
-            val shScriptPath = fileConfig.binPath.resolve(fileConfig.name)
+            val shScriptPath = fileConfig.executable
             val jsPath = fileConfig.srcGenPath.resolve("dist").resolve("${fileConfig.name}.js")
             FileUtil.writeToFile("#!/bin/sh\nnode $jsPath", shScriptPath)
             shScriptPath.toFile().setExecutable(true)