Skip to content

installer: add arm64 artifact option #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2021
Merged

installer: add arm64 artifact option #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions installer/install.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ LZMAUseSeparateProcess=yes
OutputBaseFilename={#FILENAME_VERSION}
OutputDir={#GetEnv('TEMP')}
#else
#ifdef INSTALLER_FILENAME_SUFFIX
OutputBaseFilename={#APP_NAME+'-'+FILENAME_VERSION+'-'+INSTALLER_FILENAME_SUFFIX}
#else
OutputBaseFilename={#APP_NAME+'-'+FILENAME_VERSION}-{#BITNESS}-bit
#endif
#ifdef OUTPUT_DIRECTORY
OutputDir={#OUTPUT_DIRECTORY}
#else
Expand Down
18 changes: 18 additions & 0 deletions installer/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ do
--include-pdbs)
include_pdbs=t
;;
--include-arm64-artifacts=*)
case "${1#*=}" in
/*) ;; # absolute path, okay
*) die "Need an absolute path: $1";;
esac
arm64_artifacts_directory="${1#*=}"
;;
*)
break
esac
Expand Down Expand Up @@ -256,6 +263,17 @@ test -z "$include_pdbs" || {
} ||
die "Could not include .pdb files"

test -z "$arm64_artifacts_directory" || {
echo "Including ARM64 artifacts from $arm64_artifacts_directory" &&
inno_defines="$inno_defines$LF#define INSTALLER_FILENAME_SUFFIX 'arm64'" &&
mixed="$(cygpath -m "$arm64_artifacts_directory")" &&
find "$arm64_artifacts_directory" -type f |
sed -e "s|^$arm64_artifacts_directory\\(/.*\)\?/\([^/]*\)$|Source: \"$mixed\\1/\\2\"; DestDir: {app}/arm64\\1; Flags: replacesameversion restartreplace; AfterInstall: DeleteFromVirtualStore|" \
-e 's|/|\\|g' \
>> file-list.iss
} ||
die "Could not include ARM64 artifacts"

etc_gitconfig_dir="${etc_gitconfig%/gitconfig}"
printf "%s\n%s\n%s\n%s\n%s%s" \
"#define APP_VERSION '$displayver'" \
Expand Down