-
Notifications
You must be signed in to change notification settings - Fork 650
Add MSIX Installer #665
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.
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
Open
shmuelie
wants to merge
3
commits into
git-for-windows:main
Choose a base branch
from
shmuelie:add-msix-installer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+453
−139
Open
Add MSIX Installer #665
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,156 +2,27 @@ | |
|
|
||
| # Build the portable Git for Windows. | ||
|
|
||
| die () { | ||
| echo "$*" >&1 | ||
| exit 1 | ||
| } | ||
|
|
||
| output_directory="$HOME" | ||
| include_pdbs= | ||
| while test $# -gt 0 | ||
| do | ||
| case "$1" in | ||
| --output) | ||
| shift | ||
| output_directory="$1" | ||
| ;; | ||
| --output=*) | ||
| output_directory="${1#*=}" | ||
| ;; | ||
| --include-pdbs) | ||
| include_pdbs=t | ||
| ;; | ||
| -*) | ||
| die "Unknown option: $1" | ||
| ;; | ||
| *) | ||
| break | ||
| esac | ||
| shift | ||
| done | ||
|
|
||
| test $# -gt 0 || | ||
| die "Usage: $0 [--output=<directory>] <version> [optional components]" | ||
|
|
||
| test -d "$output_directory" || | ||
| die "Directory inaccessible: '$output_directory'" | ||
| . "$(dirname "$0")/../release-common.sh" | ||
|
|
||
| case "$MSYSTEM" in | ||
| MINGW32) | ||
| BITNESS=32 | ||
| ARCH=i686 | ||
| ARTIFACT_SUFFIX="32-bit" | ||
| MD_ARG=128M | ||
| MINGW_PREFIX=mingw-w64-i686- | ||
| ;; | ||
| MINGW64) | ||
| BITNESS=64 | ||
| ARCH=x86_64 | ||
| ARTIFACT_SUFFIX="64-bit" | ||
| MD_ARG=256M | ||
| MINGW_PREFIX=mingw-w64-x86_64- | ||
| ;; | ||
| CLANGARM64) | ||
| BITNESS=64 | ||
| ARCH=aarch64 | ||
| ARTIFACT_SUFFIX=arm64 | ||
| MD_ARG=256M | ||
| MINGW_PREFIX=mingw-w64-clang-aarch64- | ||
| ;; | ||
| *) | ||
| die "Unhandled MSYSTEM: $MSYSTEM" | ||
| ;; | ||
| MINGW32) ARTIFACT_SUFFIX="32-bit";; | ||
| MINGW64) ARTIFACT_SUFFIX="64-bit";; | ||
| CLANGARM64) ARTIFACT_SUFFIX=arm64;; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm surprised |
||
| esac | ||
| MSYSTEM_LOWER=${MSYSTEM,,} | ||
| VERSION=$1 | ||
| shift | ||
|
|
||
| TARGET="$output_directory"/PortableGit-"$VERSION"-"$ARTIFACT_SUFFIX".7z.exe | ||
| OPTS7="-m0=lzma -mqs -mlc=8 -mx=9 -md=$MD_ARG -mfb=273 -ms=256M " | ||
| TMPPACK=/tmp.7z | ||
| SCRIPT_PATH="$(cd "$(dirname "$0")" && pwd)" | ||
|
|
||
| case "$SCRIPT_PATH" in | ||
| *" "*) | ||
| die "This script cannot handle spaces in $SCRIPT_PATH" | ||
| ;; | ||
| esac | ||
|
|
||
|
|
||
| # Generate a couple of files dynamically | ||
|
|
||
| cp "$SCRIPT_PATH/../LICENSE.txt" "$SCRIPT_PATH/root/" || | ||
| die "Could not copy license file" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/dev/mqueue" || | ||
| die "Could not make /dev/mqueue directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/dev/shm" || | ||
| die "Could not make /dev/shm/ directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/etc" || | ||
| die "Could not make etc/ directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/tmp" || | ||
| die "Could not make tmp/ directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/bin" || | ||
| die "Could not make bin/ directory" | ||
|
|
||
| cp /cmd/git.exe "$SCRIPT_PATH/root/bin/git.exe" && | ||
| cp /$MSYSTEM_LOWER/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/bash.exe" && | ||
| cp /$MSYSTEM_LOWER/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/sh.exe" || | ||
| die "Could not install bin/ redirectors" | ||
| prepare_root | ||
|
|
||
| cp "$SCRIPT_PATH/../post-install.bat" "$SCRIPT_PATH/root/" || | ||
| die "Could not copy post-install script" | ||
|
|
||
| etc_gitconfig="$(git -c core.editor=echo config --system -e 2>/dev/null)" && | ||
| etc_gitconfig="$(cygpath -au "$etc_gitconfig")" && | ||
| etc_gitconfig="${etc_gitconfig#/}" || | ||
| die "Could not determine the path of the system config" | ||
|
|
||
| # Make a list of files to include | ||
| LIST="$(ARCH=$ARCH ETC_GITCONFIG="$etc_gitconfig" \ | ||
| PACKAGE_VERSIONS_FILE="$SCRIPT_PATH"/root/etc/package-versions.txt \ | ||
| sh "$SCRIPT_PATH"/../make-file-list.sh "$@" | | ||
| grep -v "^$etc_gitconfig$")" || | ||
| die "Could not generate file list" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/${etc_gitconfig%/*}" && | ||
| cp /"$etc_gitconfig" "$SCRIPT_PATH/root/$etc_gitconfig" && | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" \ | ||
| credential.helper manager || | ||
| die "Could not configure Git-Credential-Manager as default" | ||
| test 64 != $BITNESS || | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" --unset pack.packSizeLimit | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" core.fscache true | ||
|
|
||
| case "$LIST" in | ||
| */git-credential-helper-selector.exe*) | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" \ | ||
| credential.helper helper-selector | ||
| ;; | ||
| esac | ||
|
|
||
| git_core="$SCRIPT_PATH/root/$MSYSTEM_LOWER/libexec/git-core" && | ||
| rm -rf "$git_core" && | ||
| mkdir -p "$git_core" && | ||
| if test "$(stat -c %D /$MSYSTEM_LOWER/bin)" = "$(stat -c %D "$git_core")" | ||
| then | ||
| ln_or_cp=ln | ||
| else | ||
| ln_or_cp=cp | ||
| fi && | ||
| $ln_or_cp $(echo "$LIST" | sed -n "s|^$MSYSTEM_LOWER/bin/[^/]*\.dll$|/&|p") "$git_core" || | ||
| die "Could not copy .dll files into libexec/git-core/" | ||
|
|
||
| test -z "$include_pdbs" || { | ||
| find "$SCRIPT_PATH/root" -name \*.pdb -exec rm {} \; && | ||
| "$SCRIPT_PATH"/../please.sh bundle-pdbs \ | ||
| --arch=$ARCH --unpack="$SCRIPT_PATH"/root | ||
| } || | ||
| die "Could not unpack .pdb files" | ||
| init_etc_gitconfig | ||
| generate_file_list "$@" | ||
| copy_dlls_to_libexec | ||
| unpack_pdbs | ||
|
|
||
| TITLE="$BITNESS-bit" | ||
| test $ARCH == "aarch64" && TITLE="ARM64" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| # Common helpers for release scripts. | ||
| # Source this file; it consumes the shared command-line flags and | ||
| # leaves the remaining positional parameters (optional components) in "$@". | ||
| # | ||
| # After sourcing, the following variables are set: | ||
| # output_directory, include_pdbs, VERSION, | ||
| # BITNESS, ARCH, MD_ARG, MINGW_PREFIX, MSYSTEM_LOWER, SCRIPT_PATH | ||
| # | ||
| # The following functions are available: | ||
| # die, prepare_root, init_etc_gitconfig, | ||
| # generate_file_list, copy_dlls_to_libexec, unpack_pdbs | ||
|
|
||
| die () { | ||
| echo "$*" >&1 | ||
| exit 1 | ||
| } | ||
|
|
||
| output_directory="$HOME" | ||
| include_pdbs= | ||
| while test $# -gt 0 | ||
| do | ||
| case "$1" in | ||
| --output) | ||
| shift | ||
| output_directory="$1" | ||
| ;; | ||
| --output=*) | ||
| output_directory="${1#*=}" | ||
| ;; | ||
| --include-pdbs) | ||
| include_pdbs=t | ||
| ;; | ||
| -*) | ||
| die "Unknown option: $1" | ||
| ;; | ||
| *) | ||
| break | ||
| esac | ||
| shift | ||
| done | ||
|
|
||
| test $# -gt 0 || | ||
| die "Usage: $0 [--output=<directory>] <version> [optional components]" | ||
|
|
||
| test -d "$output_directory" || | ||
| die "Directory inaccessible: '$output_directory'" | ||
|
|
||
| case "$MSYSTEM" in | ||
| MINGW32) | ||
| BITNESS=32 | ||
| ARCH=i686 | ||
| MD_ARG=128M | ||
| MINGW_PREFIX=mingw-w64-i686- | ||
| ;; | ||
| MINGW64) | ||
| BITNESS=64 | ||
| ARCH=x86_64 | ||
| MD_ARG=256M | ||
| MINGW_PREFIX=mingw-w64-x86_64- | ||
| ;; | ||
| CLANGARM64) | ||
| BITNESS=64 | ||
| ARCH=aarch64 | ||
| MD_ARG=256M | ||
| MINGW_PREFIX=mingw-w64-clang-aarch64- | ||
| ;; | ||
| *) | ||
| die "Unhandled MSYSTEM: $MSYSTEM" | ||
| ;; | ||
| esac | ||
| MSYSTEM_LOWER=${MSYSTEM,,} | ||
| VERSION=$1 | ||
| shift | ||
|
|
||
| SCRIPT_PATH="$(cd "$(dirname "$0")" && pwd)" | ||
|
|
||
| case "$SCRIPT_PATH" in | ||
| *" "*) | ||
| die "This script cannot handle spaces in $SCRIPT_PATH" | ||
| ;; | ||
| esac | ||
|
|
||
| # Set up the root directory with common files and redirectors. | ||
| prepare_root () { | ||
| mkdir -p "$SCRIPT_PATH/root/" || | ||
| die "Could not make root" | ||
|
|
||
| cp "$SCRIPT_PATH/../LICENSE.txt" "$SCRIPT_PATH/root/" || | ||
| die "Could not copy license file" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/dev/mqueue" || | ||
| die "Could not make /dev/mqueue directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/dev/shm" || | ||
| die "Could not make /dev/shm/ directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/etc" || | ||
| die "Could not make etc/ directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/tmp" || | ||
| die "Could not make tmp/ directory" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/bin" || | ||
| die "Could not make bin/ directory" | ||
|
|
||
| cp /cmd/git.exe "$SCRIPT_PATH/root/bin/git.exe" && | ||
| cp /$MSYSTEM_LOWER/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/bash.exe" && | ||
| cp /$MSYSTEM_LOWER/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/sh.exe" || | ||
| die "Could not install bin/ redirectors" | ||
| } | ||
|
|
||
| # Detect the system gitconfig path. | ||
| # Sets: etc_gitconfig | ||
| init_etc_gitconfig () { | ||
| etc_gitconfig="$(git -c core.editor=echo config --system -e 2>/dev/null)" && | ||
| etc_gitconfig="$(cygpath -au "$etc_gitconfig")" && | ||
| etc_gitconfig="${etc_gitconfig#/}" || | ||
| die "Could not determine the path of the system config" | ||
| } | ||
|
|
||
| # Generate the file list and configure the system gitconfig. | ||
| # Pass any optional components as arguments. | ||
| # Sets: LIST | ||
| generate_file_list () { | ||
| LIST="$(ARCH=$ARCH ETC_GITCONFIG="$etc_gitconfig" \ | ||
| PACKAGE_VERSIONS_FILE="$SCRIPT_PATH"/root/etc/package-versions.txt \ | ||
| sh "$SCRIPT_PATH"/../make-file-list.sh "$@" | | ||
| grep -v "^$etc_gitconfig$")" || | ||
| die "Could not generate file list" | ||
|
|
||
| mkdir -p "$SCRIPT_PATH/root/${etc_gitconfig%/*}" && | ||
| cp /"$etc_gitconfig" "$SCRIPT_PATH/root/$etc_gitconfig" && | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" \ | ||
| credential.helper manager || | ||
| die "Could not configure Git-Credential-Manager as default" | ||
| test 64 != $BITNESS || | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" --unset pack.packSizeLimit | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" core.fscache true | ||
|
|
||
| case "$LIST" in | ||
| */git-credential-helper-selector.exe*) | ||
| git config -f "$SCRIPT_PATH/root/$etc_gitconfig" \ | ||
| credential.helper helper-selector | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| # Copy DLL files into libexec/git-core for runtime. | ||
| copy_dlls_to_libexec () { | ||
| git_core="$SCRIPT_PATH/root/$MSYSTEM_LOWER/libexec/git-core" && | ||
| rm -rf "$git_core" && | ||
| mkdir -p "$git_core" && | ||
| if test "$(stat -c %D /$MSYSTEM_LOWER/bin)" = "$(stat -c %D "$git_core")" | ||
| then | ||
| ln_or_cp=ln | ||
| else | ||
| ln_or_cp=cp | ||
| fi && | ||
| $ln_or_cp $(echo "$LIST" | sed -n "s|^$MSYSTEM_LOWER/bin/[^/]*\.dll$|/&|p") "$git_core" || | ||
| die "Could not copy .dll files into libexec/git-core/" | ||
| } | ||
|
|
||
| # Unpack PDB files if --include-pdbs was given. | ||
| unpack_pdbs () { | ||
| test -z "$include_pdbs" || { | ||
| find "$SCRIPT_PATH/root" -name \*.pdb -exec rm {} \; && | ||
| "$SCRIPT_PATH"/../please.sh bundle-pdbs \ | ||
| --arch=$ARCH --unpack="$SCRIPT_PATH"/root | ||
| } || | ||
| die "Could not unpack .pdb files" | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think
MD_ARGshould be common.