diff --git a/Makefile b/Makefile index ac78b7d..2d9b153 100644 --- 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 index ac2c633..6769bad 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit ac2c633ff11c40e6a598aec9856fa83de0413fa4 +Subproject commit 6769bad2b22e4725d21e7e74c00bc8023453c181 diff --git a/src/main/factories/ipcs/pipeline.ts b/src/main/factories/ipcs/pipeline.ts index c025922..e39811e 100644 --- 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 :