diff --git a/editor/src/com/talosvfx/talos/TALOS_BUILD.java b/editor/src/com/talosvfx/talos/TALOS_BUILD.java index ed3deaa45..59cfac98b 100644 --- a/editor/src/com/talosvfx/talos/TALOS_BUILD.java +++ b/editor/src/com/talosvfx/talos/TALOS_BUILD.java @@ -14,13 +14,13 @@ public final class TALOS_BUILD { private static final String version = "2.0.0-SNAPSHOT"; @Getter - private static final String commit = "7085851"; + private static final String commit = "0a1100a"; @Getter private static final String branch = "talos-3d"; @Getter - private static final Date buildDate = new Date(1683799528613l); + private static final Date buildDate = new Date(1705408205407l); private static void printHeader() { System.out.println(" ___ ___ ___ ___ ___ \n" diff --git a/editor/src/com/talosvfx/talos/editor/project2/savestate/SaveSystem.java b/editor/src/com/talosvfx/talos/editor/project2/savestate/SaveSystem.java index 13d335272..798d8f7da 100644 --- a/editor/src/com/talosvfx/talos/editor/project2/savestate/SaveSystem.java +++ b/editor/src/com/talosvfx/talos/editor/project2/savestate/SaveSystem.java @@ -92,11 +92,14 @@ public void onExport (ExportRequest event) { } if(!exportScript.isEmpty()) { + Toasts.getInstance().showInfoToast("Export script defined, trying to run"); + FileHandle exportScriptHandle = settings.getExportScriptHandle(); String projectPath = currentProject.rootProjectDir().path(); if (exportScriptHandle.exists() && !exportScriptHandle.isDirectory()) { Runtime rt = Runtime.getRuntime(); + Toasts.getInstance().showInfoToast("Export script found in file system"); try { String nodeCommand = "node"; @@ -109,6 +112,9 @@ public void onExport (ExportRequest event) { if(!nodeBinary.exists()) { nodeCommand = "/opt/homebrew/bin/node"; } + + Toasts.getInstance().showInfoToast("Trying to launch build script runner for " + nodeCommand); + ProcessBuilder pb = new ProcessBuilder("bash", "-l", "-c", nodeCommand + " " + buildScriptPath + " " + projectDirectoryPath + " " + projectFilePathComm); pb.inheritIO(); pb.start(); @@ -120,8 +126,13 @@ public void onExport (ExportRequest event) { } catch (IOException e) { e.printStackTrace(); logger.error("Error when running processor", e); + Toasts.getInstance().showErrorToast("Error when running processor " + e.getMessage()); } + } else { + Toasts.getInstance().showInfoToast("Export script not found in file system"); } + } else { + Toasts.getInstance().showInfoToast("No export script defined"); } } }