git subrepo pull assembly

subrepo:
  subdir:   "assembly"
  merged:   "8b2c69ea70"
upstream:
  origin:   "[email protected]:daisy/pipeline-assembly.git"
  branch:   "master"
  commit:   "cac8f03f95"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

assembly/.gitrepo

@@ -7,5 +7,5 @@
 	remote = [email protected]:daisy/pipeline-assembly.git
 	branch = master
 	commit = cac8f03f95d4ec82d2bbe935e5b2439840037301
-	parent = 1c57eb0ad21e2d1a790f185f1d4797edc9f41d52
+	parent = 79285a42165699727861a380e56c4819e4b55efc
 	cmdver = 0.3.1

assembly/Makefile

@@ -219,7 +219,7 @@ ifneq ($(OS), WINDOWS)
 .PHONY : docker
 # Note that when `docker' is enabled together with other targets, it is as if --without-osgi was also specified.
 docker : mvn -Pwithout-osgi \
-         target/maven-jlink/classifiers/linux \
+         jre/target/maven-jlink/classifiers/linux \
          target/assembly-$(assembly/VERSION)-linux/daisy-pipeline/bin/pipeline2
 ifndef DUMP_PROFILES
 	mkdirs("target/docker");                                                                           \
@@ -249,9 +249,9 @@ dev-launcher : target/dev-launcher/pipeline2
 target/dev-launcher/pipeline2 : pom.xml
 ifdef BUILD_JRE_FOR_DEV_LAUNCHER
 ifeq ($(OS), MACOSX)
-target/dev-launcher/pipeline2 : target/maven-jlink/classifiers/mac target/assembly-$(assembly/VERSION)-mac/daisy-pipeline/bin/pipeline2
+target/dev-launcher/pipeline2 : jre/target/maven-jlink/classifiers/mac target/assembly-$(assembly/VERSION)-mac/daisy-pipeline/bin/pipeline2
 else
-target/dev-launcher/pipeline2 : target/maven-jlink/classifiers/linux target/assembly-$(assembly/VERSION)-linux/daisy-pipeline/bin/pipeline2
+target/dev-launcher/pipeline2 : jre/target/maven-jlink/classifiers/linux target/assembly-$(assembly/VERSION)-linux/daisy-pipeline/bin/pipeline2
 endif
 ifndef DUMP_PROFILES
 	mkdirs("$(dir $@)");                                \
@@ -278,8 +278,8 @@ ifndef DUMP_PROFILES
 endif
 endif
 
-target/maven-jlink/classifiers/mac                                     : mvn -Pbuild-jre-mac
-target/maven-jlink/classifiers/linux                                   : mvn -Pbuild-jre-linux
+jre/target/maven-jlink/classifiers/mac                                 : mvn -Pbuild-jre-mac
+jre/target/maven-jlink/classifiers/linux                               : mvn -Pbuild-jre-linux
 
 target/assembly-$(assembly/VERSION)-mac/daisy-pipeline/bin/pipeline2   : mvn -Pcopy-artifacts \
                                                                              -Pgenerate-release-descriptor \

assembly/make/enable-java-shell.mk

@@ -5,11 +5,21 @@ endif
 ifeq ($(OS),Windows_NT)
 SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
 else
-ifeq ($(shell uname -s),Darwin)
+UNAME_S := $(shell uname -s)
+UNAME_P := $(shell uname -p)
+ifeq ($(UNAME_S),Darwin)
+ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),)
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_arm64/eval-java
+else
 SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_amd64/eval-java
+endif
+else
+ifeq ($(UNAME_S),Linux)
+ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),)
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_arm64/eval-java
 else
-ifeq ($(shell uname -s),Linux)
 SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_amd64/eval-java
+endif
 else
 SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
 endif

assembly/pom.xml

@@ -76,7 +76,7 @@
       <dependency>
         <groupId>org.daisy.pipeline.modules</groupId>
         <artifactId>modules-bom</artifactId>
-        <version>1.14.26</version>
+        <version>1.14.27-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>