Skip to content

Commit d6debdb

Browse files
committed
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
Let the documentation reflect that there is no vs/master anymore
2 parents 350d5b0 + 92047a8 commit d6debdb

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

compat/vcbuild/README

+9-19
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,17 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
4141

4242
================================================================
4343

44-
Alternatively, run `make vcxproj` and then load the generated `git.sln` in
45-
Visual Studio. The initial build will install the vcpkg system and build the
44+
Alternatively, just open Git's top-level directory in Visual Studio, via
45+
`File>Open>Folder...`. This will use CMake internally to generate the
46+
project definitions. It will also install the vcpkg system and build the
4647
dependencies automatically. This will take a while.
4748

48-
Instead of generating the `git.sln` file yourself (which requires a full Git
49-
for Windows SDK), you may want to consider fetching the `vs/master` branch of
50-
https://github.com/git-for-windows/git instead (which is updated automatically
51-
via CI running `make vcxproj`). The `vs/master` branch does not require a Git
52-
for Windows to build, but you can run the test scripts in a regular Git Bash.
53-
54-
Note that `make vcxproj` will automatically add and commit the generated `.sln`
55-
and `.vcxproj` files to the repo. This is necessary to allow building a
56-
fully-testable Git in Visual Studio, where a regular Git Bash can be used to
57-
run the test scripts (as opposed to a full Git for Windows SDK): a number of
58-
build targets, such as Git commands implemented as Unix shell scripts (where
59-
`@@SHELL_PATH@@` and other placeholders are interpolated) require a full-blown
60-
Git for Windows SDK (which is about 10x the size of a regular Git for Windows
61-
installation).
62-
63-
If your plan is to open a Pull Request with Git for Windows, it is a good idea
64-
to drop this commit before submitting.
49+
You can also generate the Visual Studio solution manually by downloading
50+
and running CMake explicitly rather than letting Visual Studio doing
51+
that implicitly.
52+
53+
Another, deprecated option is to run `make vcxproj`. This option is
54+
superseded by the CMake-based build, and will be removed at some point.
6555

6656
================================================================
6757
The Steps of Build Git with VS2008

0 commit comments

Comments
 (0)