Merge pull request #153 from daisy/engine-1.14.15-SNAPSHOT

Update engine to latest snapshot version (1.14.15-SNAPSHOT)
daisy · Sep 22, 2023 · 3b9c7e0 · 3b9c7e0
2 parents 8006f57 + 4a68a91
commit 3b9c7e0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ src/resources/daisy-pipeline : engine/target/assembly-$(ENGINE_VERSION)-$(zip_cl
 ifeq ($(OS), MACOSX)
 	// FIXME: unzip() currently does not preserve file permissions \
 	exec("chmod", "+x", "$@/jre/bin/java");
+	exec("chmod", "+x", "$@/jre/lib/jspawnhelper");
 endif
 
 engine/target/assembly-$(ENGINE_VERSION)-$(zip_classifier).zip : \

diff --git a/engine b/engine
diff --git a/src/main/factories/ipcs/pipeline.ts b/src/main/factories/ipcs/pipeline.ts
@@ -395,7 +395,7 @@ Then close the program using the port and restart this application.`,
                 ...SystemProps,
                 '-classpath',
                 `"${delimiter}${relativeJarFiles.join(delimiter)}${delimiter}"`,
-                'org.daisy.pipeline.webservice.impl.PipelineWebService',
+                'org.daisy.pipeline.webservice.restlet.impl.PipelineWebService',
             ]
             this.pushMessage(
                 `Launching the local pipeline with the following command :