diff --git a/Building-Git.md b/Building-Git.md index 7c656dd..4cdf46e 100644 --- a/Building-Git.md +++ b/Building-Git.md @@ -6,26 +6,17 @@ As we are in the process of switching away from msysGit as our development envir 1. Install MSys2 from https://msys2.github.io/, into `C:/msys32` and `C:/msys64` (if you only want to build for one architecture, you can skip the other one). This will install three Shells into the Start Menu: the *MSys*, the *MinGW 32* and the *MinGW 64* Shell. To build Git, you should start the *MinGW* shell corresponding to the architecture of the installed MSys2. -2. Add the Git for Windows-specific Pacman repository: insert the following lines into your `/etc/pacman.conf`, **before** the `[mingw]` line (it is important : -> [git-for-windows] -> Server = https://git-for-windows.github.io/pacman-repository/$arch -> SigLevel = Optional - -3. Update via Pacman: `pacman -Syu` (as the msys2-runtime gets updated, the *MSys Shell* needs to be restarted afterwards). +2. Download and run [this file](https://raw.githubusercontent.com/git-for-windows/build-extra/master/setup-git-sdk.bat) in a `cmd` window in the top-level MSys2 directory (you need to close all MSys2 windows before that, so that the `msys-2.0.dll` file can be updated). # Build Git -1. Install (MSys2) Git: `pacman -S git`. That Git is based on MSys2, i.e. it is *not* a MinGW Git. However, we need a working Git to check out the Git source, eh? :grinning: +1. Clone Git: `cd /usr/src/ && git clone https://github.com/git-for-windows/git`. -2. Clone Git: `cd /usr/src/ && git clone https://github.com/git-for-windows/git`. +2. Temporarily: In /usr/src/git/, check out the `update-to-2.3.0` branch: `git remote add -f dscho https://github.com/dscho/git && git checkout -t dscho/update-to-2.3.0`. -3. Install the Toolchain (gcc etc): `pacman -S mingw-w64--toolchain`, where `` is either `i686` or `x86_64`. +3. Build Git: `make`. -4. Install Git's dependencies: `pacman -S python less openssh patch make tar diffutils ca-certificates perl-Error perl perl-Authen-SASL perl-libwww perl-MIME-tools perl-Net-SMTP-SSL perl-TermReadKey winpty-git mingw-w64--curl mingw-w64--expat mingw-w64--openssl mingw-w64--tcl mingw-w64--pcre` - -5. Temporarily: In /usr/src/git/, check out the `update-to-2.3.0` branch: `git remote add -f dscho https://github.com/dscho/git && git checkout -t dscho/update-to-2.3.0`. - -6. Build Git. Some dependencies might be missing, still, e.g. subversion, gettext, man, mingw-w64--gdb, binutils or texinfo (these packages were installed manually before the first successful Git for Windows build). +4. Run the test suite: `make test` ***