From 00b3e97356ac7f6d85d59d3480352ad3d8723640 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Fri, 12 Jul 2024 18:38:14 +0200 Subject: [PATCH] git subrepo pull assembly subrepo: subdir: "assembly" merged: "8b2c69ea70" upstream: origin: "git@github.com:daisy/pipeline-assembly.git" branch: "master" commit: "cac8f03f95" git-subrepo: version: "0.3.1" origin: "???" commit: "???" --- assembly/.gitrepo | 2 +- assembly/Makefile | 10 +++++----- assembly/make/bin/darwin_arm64/eval-java | Bin 0 -> 33920 bytes assembly/make/bin/linux_arm64/eval-java | Bin 0 -> 71456 bytes assembly/make/enable-java-shell.mk | 14 ++++++++++++-- assembly/pom.xml | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) create mode 100755 assembly/make/bin/darwin_arm64/eval-java create mode 100755 assembly/make/bin/linux_arm64/eval-java diff --git a/assembly/.gitrepo b/assembly/.gitrepo index bd26bea8d8..a1fb8ce0a8 100644 --- a/assembly/.gitrepo +++ b/assembly/.gitrepo @@ -7,5 +7,5 @@ remote = git@github.com:daisy/pipeline-assembly.git branch = master commit = cac8f03f95d4ec82d2bbe935e5b2439840037301 - parent = 1c57eb0ad21e2d1a790f185f1d4797edc9f41d52 + parent = 79285a42165699727861a380e56c4819e4b55efc cmdver = 0.3.1 diff --git a/assembly/Makefile b/assembly/Makefile index ba8b923a50..b97ef227f0 100644 --- a/assembly/Makefile +++ b/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 \ diff --git a/assembly/make/bin/darwin_arm64/eval-java b/assembly/make/bin/darwin_arm64/eval-java new file mode 100755 index 0000000000000000000000000000000000000000..1c85ed0422ac1abe21041d14cd953b431b9272c0 GIT binary patch literal 33920 zcmeI5VQd^n6~|}eI5>gkLI^FCqAa1NNhRzCu&`PJcGHDzsS~S-QB<{T&v$$AHRrqY z-kzHX9b9y=p&N`oF?v20y>D~7Tp|uGiHbHifY!+fd=;#UYVTcK_ ztik>-84nu|9VTmQ(OT6TYUF1U6D{kgaqMX86uG{y)h2ws9cB`QB#ULa_DR=Q&;}~VYA4~)~_rp<7S65>!zT;BcE6P68;R*n@fl9Z;NlVtVqUn;>qLd zdTYKf`u=|JkCWb9=p8f{%gQF7h$o{~JQ+)2AQ<1w7gT)5{6(Y(eKh-{_b?^>+}D4! z-#U2s&=K`E`jnpr_h3u=gM`@99kd< z8~5Gc*dzHsT+pfH{g+Dd$o(U&LVN~86d%2169b?2b@Q|kgD?}D4?$+2--33wAVdxA zdm%L5T<8%bA80lP`a7_`GhiciJ4A=P57M2@INgc(aCh`nA_|?#M<5hO_3c;AKlYoR zr@w7Kf9qdA{+INpVACNQM0(k@UG|B+(B5sk6OGJ|bdNfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO1egF5U;<2l2`~XBzyz28 z6JP>NfC(@GCcp%k025#W{|SL1v-n4|uyU7K%+<|OuI~K~$DE4B^^$SDP}x*8R;$Je z`70SK_ZZhhyyS?q4KRTnkA!Nl6Et4CG^7PjzayB(76i6 z&l+#dYM}`_R=7-uyGn*vsAxsQTmJFd+S(1)?Fmh6mGf5RywznW6o%ARmQP?+$)GVa zQunsOuURyfs>U^%26s!PfosKA3m3KG&^5$zX>-S(s!>xuYBH7cP^!jNX&R`t4P5n8 zS!_;)?15Ak&l-z?RIbXPt~RC8vJR=-{O_WAgi<#n1GTfeIvQcWUbv(cvlRB^u8xvX zliq8~2NkFrWY$>NlCPv-7GAmQ(U)Ugq1|UFQ6b;=>6JXX@|72}t7dV?ldt{{I3#Bl zt7f6P6{2|;q;4#c_e%sdhiCR@2j&h*U(rP+X6W5z7E|3EpJB_}Y= z!8EN*^Dxz6s-X4IUN)=70>$XvjtNC$x{#Y*^U0MDjKSvZL-isZ?eqSOLwOh%p^1km zl~QiiEN5rDMVQS}dlJVE%@Xa1Je*S~lim+8RO@Lh`zhN>QVGc#<{}MHwtxxMSC~&eC|7*0Xsta zEoPggUOX0&_Phxrp4q>?dN+EZ-F@o)6jstz;~h8<^i|R;q9kNKcvIBv>p)H*f8aT+ z^R}RZUNZ~1nh2elP(*6pPHCqXy4~}D4RaQN3X-ig-s00_CtJDaahmSG#oUIO67x!G z`DK%mJEK1J++{DRrXi{2ayW~Go~0?i z`MC}AH(~aEMmlZL=7eUv@2hE)5WFIx*WQr{&3fOX5f#?^R!d58vgwVq_pw!jYqvNJ)ozK9$)_GpmKa%wY zS^q@VKb7^*W&I0T)7rJpmt_62tbZx%s;sZb`ZZbqO4e`4`c2f`U0v#*_+%sz&ScVI zcSP9Z;e_>gcswj(Dd&W+9Vg}JPBxjuv1~n(8XXNMqxxf=nLG5ootb^x#1rATn~q0C z%TP2P)srb#w@=1hbez#}B5`V)c%c6){g!!nz!2TT@npAriX#U5kD5X$58%0aJfl1I zST^q1QQb|^vvqd_#!SSCr(J#TaF%?!dMuSiDDkAe?p8;rsiaO05t%v%d>dLS%`LX2 zJlo!fmZWhmo%+oMUoFlcYdF&jTB@vf8U~#B%`4-MJozP^)=^96pQ)w)_o$_F+tkv| zrk2hKQ%ip?sHK>xr5!~rokOPfCcmZsI!O=ttvbuRBTrkB?EabXyi~bj0!)AjFaajO z1egF5U;<2l2`~XBzyz286JP>NfC(@GCcp%k025#WOn?b60Vco%m;e)C0!)AjFaajO z1egF5U;<2l2`~XBzyz286JP>NfC(@GCcp%k025#WOn?b60VeQ&L_kNbgOC{r{nmN& z1p(^(Ka41JxkIDKejjcF=xbQiIt>>HXuBZzp>pkukYR`e`8woD$TVaYg8M5pT#KRo z8uB*eZ;&mT&~Ap@3Ax*k!m=!RfdhVF-paU9^wX;AM8d8W89C9=(x;SWpR^<6m_rvg z2rCvzq%tBNmP|F{D{0YI)ZrYNY=Hj5j%`5#8%SPEfqJ7 zhT}=Gb1a*3ZTX}0a8VgsZJWU*4CF4Psaq0=2;IX&w{Fbg&JEH(=IiwP@1)=1>y=)m zcR`1phGh9H>Sq1kfKL0MdHkyZJr>Xt0o@JgUkm7`1Nzy3{;hyM70_n_I<`_vymJA4 zKA>L==&uHJ+V5K+biW1NZ9(^1(47`^p9S4zLHAhD9Ts$d1-%uzw}S4hpzj9TUVIQj m?}+@+of-cPUvMLIZ1aEJL~>K9O@!TxO=PJ}^uO}a2=PxTP0Kj| literal 0 HcmV?d00001 diff --git a/assembly/make/bin/linux_arm64/eval-java b/assembly/make/bin/linux_arm64/eval-java new file mode 100755 index 0000000000000000000000000000000000000000..6945ce0e2b3f86515c13662288af6d41d745ff76 GIT binary patch literal 71456 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 literal 0 HcmV?d00001 diff --git a/assembly/make/enable-java-shell.mk b/assembly/make/enable-java-shell.mk index c82bb03411..80b7674e98 100644 --- a/assembly/make/enable-java-shell.mk +++ b/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 diff --git a/assembly/pom.xml b/assembly/pom.xml index a359f95c3b..43ddef02f4 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -76,7 +76,7 @@ org.daisy.pipeline.modules modules-bom - 1.14.26 + 1.14.27-SNAPSHOT pom import