Skip to content

Commit 50f9a18

Browse files
dennisamelingdscho
authored andcommitted
please.sh: optionally include ARM64 artifacts
Affects the make_installers_from_mingw_w64_git function. Adds a new option --include-arm64-artifacts, which allows the user to include ARM64 artifacts in the generated build. This is necessary until native ARM64 packages can be built on MSYS2. Can be invoked as follows, for example: ./please.sh make_installers_from_mingw_w64_git \ --include-arm64-artifacts=$PWD/arm64 --version=2.30.0 -o artifacts \ --portable Signed-off-by: Dennis Ameling <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 6aae062 commit 50f9a18

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

please.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4770,12 +4770,13 @@ build_mingw_w64_git () { # [--only-32-bit] [--only-64-bit] [--skip-test-artifact
47704770
}
47714771
47724772
# This function does not "clean up" after installing the packages
4773-
make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--version=<version>] [--installer] [--portable] [--mingit] [--mingit-busybox] [--nuget] [--nuget-mingit] [--archive]
4773+
make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--version=<version>] [--installer] [--portable] [--mingit] [--mingit-busybox] [--nuget] [--nuget-mingit] [--archive] [--include-arm64-artifacts=<path>]
47744774
modes=
47754775
install_package=
47764776
output=
47774777
output_path=
47784778
version=0-test
4779+
include_arm64_artifacts=
47794780
while case "$1" in
47804781
--pkg=*)
47814782
install_package="${install_package:+$install_package }$(echo "${1#*=}" | tr , ' ')"
@@ -4820,6 +4821,9 @@ make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--ve
48204821
output_path="$(cygpath -am "${1#-?}")"
48214822
output="--output=$output_path" || exit
48224823
;;
4824+
--include-arm64-artifacts=*)
4825+
include_arm64_artifacts="$1"
4826+
;;
48234827
-*) die "Unknown option: %s\n" "$1";;
48244828
*) break;;
48254829
esac; do shift; done
@@ -4855,7 +4859,7 @@ make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--ve
48554859
test installer != $mode ||
48564860
extra="${extra:+$extra }--window-title-version=$version"
48574861
4858-
sh -x "${this_script_path%/*}/$mode/release.sh" $output $extra $version
4862+
sh -x "${this_script_path%/*}/$mode/release.sh" $output $extra $include_arm64_artifacts $version
48594863
done
48604864
}
48614865

0 commit comments

Comments
 (0)