better wrapper scripts, get rid of executables

Author: Frotty

Wurstpack/wurstscript/grill.exe

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+RUNTIME="$HOME/.wurst/wurst-runtime/bin/java"
+
+# Resolve script dir (absolute)
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+JAR="$DIR/wurst-compiler/wurstscript.jar"
+if [[ ! -f "$JAR" ]]; then
+  JAR="$DIR/../wurst-compiler/wurstscript.jar"
+fi
+
+if [[ ! -f "$JAR" ]]; then
+  echo "[wurstscript] ERROR: Missing jar. Searched:"
+  echo "  $DIR/wurst-compiler/wurstscript.jar"
+  echo "  $DIR/../wurst-compiler/wurstscript.jar"
+  exit 2
+fi
+
+if [[ ! -x "$RUNTIME" ]]; then
+  echo "[wurstscript] ERROR: Bundled runtime not found or not executable at:"
+  echo "  $RUNTIME"
+  echo "Please reinstall wurstscript via the VSCode extension."
+  exit 3
+fi
+
+exec "$RUNTIME" -jar "$JAR" "$@"

Wurstpack/wurstscript/wurstscript

@@ -0,0 +1,30 @@
+@echo off
+setlocal EnableExtensions
+
+rem ---- shared slim runtime ----
+set "RUNTIME=%USERPROFILE%\.wurst\wurst-runtime\bin\java.exe"
+
+rem script directory (trailing backslash)
+set "DIR=%~dp0"
+
+if not exist "%RUNTIME%" (
+  echo [wurstscript] ERROR: Runtime not found:
+  echo(%RUNTIME%
+  echo Reinstall Wurstscript via the VSCode extension.
+  exit /b 1
+)
+
+rem ---- fixed jar location(s), no wildcards ----
+set "JAR=%DIR%wurst-compiler\wurstscript.jar"
+if not exist "%JAR%" set "JAR=%DIR%..\wurst-compiler\wurstscript.jar"
+if not exist "%JAR%" (
+  echo [wurstscript] ERROR: Missing jar:
+  echo(%DIR%wurst-compiler\wurstscript.jar
+  echo or
+  echo(%DIR%..\wurst-compiler\wurstscript.jar
+  exit /b 1
+)
+
+rem Optional JVM flags via env var, e.g. set WURST_JAVA_OPTS=-Xmx1g
+"%RUNTIME%" %WURST_JAVA_OPTS% -jar "%JAR%" %*
+endlocal

Wurstpack/wurstscript/wurstscript.cmd

@@ -8,7 +8,6 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'application'
     id 'antlr'
     id 'eclipse'
     id 'idea'
@@ -27,9 +26,7 @@ import org.eclipse.jgit.lib.ObjectId
 
 import java.util.regex.Pattern
 
-application {
-    mainClass = "de.peeeq.wurstio.Main"
-}
+ext.mainClassName = "de.peeeq.wurstio.Main"
 
 version = "1.8.1.0"
 
@@ -229,7 +226,9 @@ shadowJar {
     archiveBaseName.set('wurstscript')
     archiveClassifier.set('')
     archiveVersion.set('')
-    manifest { attributes 'Main-Class': application.mainClass.get() }
+    manifest {
+        attributes 'Main-Class': mainClassName
+    }
 }
 
 def fatJar = shadowJar.archiveFile.map { it.asFile }

Wurstpack/wurstscript/wurstscript.exe

@@ -167,6 +167,17 @@ tasks.register("assembleSlimCompilerDist", Copy) {
     }
 }
 
+tasks.named("assembleSlimCompilerDist", Copy) { t ->
+    if (os.isWindows()) {
+        from("../Wurstpack/wurstscript/wurstscript.cmd") { into(".") }
+    } else {
+        from("../Wurstpack/wurstscript/wurstscript") {
+            into(".")
+            fileMode = 0755
+        }
+    }
+}
+
 // 4a) Package ZIP on Windows
 tasks.register("packageSlimCompilerDistZip", Zip) {
     description = "Packages slim dist as a ZIP archive (Windows)."