Skip to content

Commit

Permalink
please.sh: optionally include ARM64 artifacts
Browse files Browse the repository at this point in the history
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 <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dennisameling authored and dscho committed Feb 4, 2021
1 parent 6aae062 commit 50f9a18
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions please.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4770,12 +4770,13 @@ build_mingw_w64_git () { # [--only-32-bit] [--only-64-bit] [--skip-test-artifact
}
# This function does not "clean up" after installing the packages
make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--version=<version>] [--installer] [--portable] [--mingit] [--mingit-busybox] [--nuget] [--nuget-mingit] [--archive]
make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--version=<version>] [--installer] [--portable] [--mingit] [--mingit-busybox] [--nuget] [--nuget-mingit] [--archive] [--include-arm64-artifacts=<path>]
modes=
install_package=
output=
output_path=
version=0-test
include_arm64_artifacts=
while case "$1" in
--pkg=*)
install_package="${install_package:+$install_package }$(echo "${1#*=}" | tr , ' ')"
Expand Down Expand Up @@ -4820,6 +4821,9 @@ make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--ve
output_path="$(cygpath -am "${1#-?}")"
output="--output=$output_path" || exit
;;
--include-arm64-artifacts=*)
include_arm64_artifacts="$1"
;;
-*) die "Unknown option: %s\n" "$1";;
*) break;;
esac; do shift; done
Expand Down Expand Up @@ -4855,7 +4859,7 @@ make_installers_from_mingw_w64_git () { # [--pkg=<package>[,<package>...]] [--ve
test installer != $mode ||
extra="${extra:+$extra }--window-title-version=$version"
sh -x "${this_script_path%/*}/$mode/release.sh" $output $extra $version
sh -x "${this_script_path%/*}/$mode/release.sh" $output $extra $include_arm64_artifacts $version
done
}
Expand Down

0 comments on commit 50f9a18

Please sign in to comment.