Skip to content

Commit ea1baed

Browse files
committed
installer: add CLANGARM64 support
This replaces our earlier efforts to support ARM64 for Git for Windows. It uses the new CLANGARM64 MSYSTEM, so ARM64 now becomes a first-class citizen. Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
1 parent 37a3a98 commit ea1baed

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

installer/release.sh

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ do
7878
--include-pdbs)
7979
include_pdbs=t
8080
;;
81-
--include-arm64-artifacts=*)
82-
case "${1#*=}" in
83-
/*) ;; # absolute path, okay
84-
*) die "Need an absolute path: $1";;
85-
esac
86-
arm64_artifacts_directory="${1#*=}"
87-
;;
8881
*)
8982
break
9083
esac
@@ -120,6 +113,11 @@ MINGW64)
120113
BITNESS=64
121114
ARCH=x86_64
122115
;;
116+
CLANGARM64)
117+
BITNESS=64
118+
ARCH=aarch64
119+
inno_defines="$inno_defines$LF#define INSTALLER_FILENAME_SUFFIX 'arm64'"
120+
;;
123121
*)
124122
die "Unhandled MSYSTEM: $MSYSTEM"
125123
;;
@@ -317,17 +315,6 @@ test -z "$include_pdbs" || {
317315
} ||
318316
die "Could not include .pdb files"
319317

320-
test -z "$arm64_artifacts_directory" || {
321-
echo "Including ARM64 artifacts from $arm64_artifacts_directory" &&
322-
inno_defines="$inno_defines$LF#define INSTALLER_FILENAME_SUFFIX 'arm64'" &&
323-
mixed="$(cygpath -m "$arm64_artifacts_directory")" &&
324-
find "$arm64_artifacts_directory" -type f |
325-
sed -e "s|^$arm64_artifacts_directory\\(/.*\)\?/\([^/]*\)$|Source: \"$mixed\\1/\\2\"; DestDir: {app}/arm64\\1; Flags: replacesameversion restartreplace; AfterInstall: DeleteFromVirtualStore|" \
326-
-e 's|/|\\|g' \
327-
>> file-list.iss
328-
} ||
329-
die "Could not include ARM64 artifacts"
330-
331318
etc_gitconfig_dir="${etc_gitconfig%/gitconfig}"
332319
printf "%s\n%s\n%s\n%s\n%s\n%s%s" \
333320
"#define APP_VERSION '$displayver'" \

0 commit comments

Comments
 (0)