Skip to content

Conversation

dscho
Copy link
Member

@dscho dscho commented May 5, 2025

This patch series drops a couple of no-longer-used parts of Git's code base.

cc: Patrick Steinhardt [email protected]

dscho added 3 commits May 5, 2025 09:20
It is not useful because we do not have any persisted directory anymore,
not since dropping our Travis CI support.

Signed-off-by: Johannes Schindelin <[email protected]>
Before we had CMake support, the only way to build Git in Visual Studio
was via this hacky `generate` script.

For a while I tried to fix whenever things got broken, in particular to
allow building confidence in embargoed releases by running the CI builds
in Azure Pipelines in a private Azure DevOps project. I even carried the
patches in Git for Windows with the intention of upstreaming them,
eventually.

However, it is a lot of work with too little benefit. CMake is much
better supported by Visual Studio. So let's drop this hacky script (plus
support code).

Signed-off-by: Johannes Schindelin <[email protected]>
Now that we dropped `contrib/buildsystems/generate` to generate Visual
Studio Solution files, it is time to also drop the `vcxproj` Makefile
target that depended on that script.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho self-assigned this May 5, 2025
@dscho
Copy link
Member Author

dscho commented May 5, 2025

/submit

Copy link

gitgitgadget bot commented May 5, 2025

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1916/dscho/ci-fixes-v1

To fetch this version to local tag pr-1916/dscho/ci-fixes-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1916/dscho/ci-fixes-v1

Copy link

gitgitgadget bot commented May 5, 2025

On the Git mailing list, Patrick Steinhardt wrote (reply to this), regarding 1ec2a4b:

On Mon, May 05, 2025 at 07:39:49AM +0000, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <[email protected]>
> 
> Before we had CMake support, the only way to build Git in Visual Studio
> was via this hacky `generate` script.
> 
> For a while I tried to fix whenever things got broken, in particular to
> allow building confidence in embargoed releases by running the CI builds
> in Azure Pipelines in a private Azure DevOps project. I even carried the
> patches in Git for Windows with the intention of upstreaming them,
> eventually.
> 
> However, it is a lot of work with too little benefit. CMake is much
> better supported by Visual Studio. So let's drop this hacky script (plus
> support code).

Makes sense. This made me wonder whether we also want to get rid of
"contrib/vscode", which is similar in spirit. Both Meson and CMake can
be used natively with VSCode.

Thanks for working on these cleanups!

Patrick

Copy link

gitgitgadget bot commented May 5, 2025

User Patrick Steinhardt <[email protected]> has been added to the cc: list.

Copy link

gitgitgadget bot commented May 5, 2025

On the Git mailing list, Johannes Schindelin wrote (reply to this), regarding 1ec2a4b:

Hi Patrick,

On Mon, 5 May 2025, Patrick Steinhardt wrote:

> [I] wonder whether we also want to get rid of "contrib/vscode", which is
> similar in spirit. Both Meson and CMake can be used natively with
> VSCode.

I would like to avoid that, as the `contrib/vscode/` files do not even
have anything in the way of building Git. Instead, there is a
configuration that allows Intellisense to find the symbols' declarations
and definitions, and it specifies a little bit the style conventions as
well as common terms that the cSpell checker benefits from.

I use this on almost a daily basis, so I believe that `contrib/vscode/` is
in a _much_ better shape than `contrib/buildsystems/`' Visual Studio
support code ever was. For that reason, I am a lot more in favor of
keeping the `vscode/` stuff.

Ciao,
Johannes

Copy link

gitgitgadget bot commented May 5, 2025

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <[email protected]>
writes:

> This patch series drops a couple of no-longer-used parts of Git's code base.
>
> Johannes Schindelin (3):
>   ci: stop linking the `prove` cache
>   contrib/buildsystems: drop support for building .vcproj/.vcxproj files
>   config.mak.uname: drop the `vcxproj` target

Thanks, will queue.

Copy link

gitgitgadget bot commented May 5, 2025

On the Git mailing list, Patrick Steinhardt wrote (reply to this), regarding 1ec2a4b:

On Mon, May 05, 2025 at 03:46:14PM +0200, Johannes Schindelin wrote:
> Hi Patrick,
> 
> On Mon, 5 May 2025, Patrick Steinhardt wrote:
> 
> > [I] wonder whether we also want to get rid of "contrib/vscode", which is
> > similar in spirit. Both Meson and CMake can be used natively with
> > VSCode.
> 
> I would like to avoid that, as the `contrib/vscode/` files do not even
> have anything in the way of building Git. Instead, there is a
> configuration that allows Intellisense to find the symbols' declarations
> and definitions, and it specifies a little bit the style conventions as
> well as common terms that the cSpell checker benefits from.
> 
> I use this on almost a daily basis, so I believe that `contrib/vscode/` is
> in a _much_ better shape than `contrib/buildsystems/`' Visual Studio
> support code ever was. For that reason, I am a lot more in favor of
> keeping the `vscode/` stuff.

Fine with me, thanks for the explanation!

Patrick

Copy link

gitgitgadget bot commented May 6, 2025

This patch series was integrated into seen via git@b49022d.

@gitgitgadget gitgitgadget bot added the seen label May 6, 2025
Copy link

gitgitgadget bot commented May 6, 2025

This branch is now known as js/ci-buildsystems-cleanup.

Copy link

gitgitgadget bot commented May 6, 2025

This patch series was integrated into seen via git@9588db4.

Copy link

gitgitgadget bot commented May 6, 2025

This patch series was integrated into next via git@b2038f9.

@gitgitgadget gitgitgadget bot added the next label May 6, 2025
Copy link

gitgitgadget bot commented May 8, 2025

There was a status update in the "Cooking" section about the branch js/ci-buildsystems-cleanup on the Git mailing list:

Code clean-up around stale CI elements and building with Visual Studio.

Will merge to 'master'.
source: <[email protected]>

Copy link

gitgitgadget bot commented May 8, 2025

This patch series was integrated into seen via git@fe3149e.

Copy link

gitgitgadget bot commented May 8, 2025

This patch series was integrated into seen via git@8821eb9.

Copy link

gitgitgadget bot commented May 9, 2025

This patch series was integrated into seen via git@da02f53.

Copy link

gitgitgadget bot commented May 12, 2025

This patch series was integrated into seen via git@18b05d1.

Copy link

gitgitgadget bot commented May 13, 2025

There was a status update in the "Cooking" section about the branch js/ci-buildsystems-cleanup on the Git mailing list:

Code clean-up around stale CI elements and building with Visual Studio.

Will merge to 'master'.
source: <[email protected]>

Copy link

gitgitgadget bot commented May 13, 2025

This patch series was integrated into seen via git@1551145.

Copy link

gitgitgadget bot commented May 13, 2025

This patch series was integrated into master via git@1551145.

Copy link

gitgitgadget bot commented May 13, 2025

This patch series was integrated into next via git@1551145.

@gitgitgadget gitgitgadget bot added the master label May 13, 2025
@gitgitgadget gitgitgadget bot closed this May 13, 2025
Copy link

gitgitgadget bot commented May 13, 2025

Closed via 1551145.

@dscho dscho deleted the ci-fixes branch May 14, 2025 08:58
Copy link

gitgitgadget bot commented Jun 2, 2025

On the Git mailing list, Johannes Schindelin wrote (reply to this), regarding 1ec2a4b:

Hi Junio,

On Mon, 5 May 2025, Johannes Schindelin via GitGitGadget wrote:

> From: Johannes Schindelin <[email protected]>
> 
> Before we had CMake support, the only way to build Git in Visual Studio
> was via this hacky `generate` script.
> 
> For a while I tried to fix whenever things got broken, in particular to
> allow building confidence in embargoed releases by running the CI builds
> in Azure Pipelines in a private Azure DevOps project. I even carried the
> patches in Git for Windows with the intention of upstreaming them,
> eventually.
> 
> However, it is a lot of work with too little benefit. CMake is much
> better supported by Visual Studio. So let's drop this hacky script (plus
> support code).

I just noticed that you applied this patch as dc5e178f608f
(contrib/buildsystems: drop support for building . vcproj/.vcxproj files,
2025-05-05). Notice the incorrect space between "." and "vcproj". Any idea
where that came from?

Ciao,
Johannes

Copy link

gitgitgadget bot commented Jun 2, 2025

On the Git mailing list, Junio C Hamano wrote (reply to this), regarding 1ec2a4b:

Johannes Schindelin <[email protected]> writes:

> I just noticed that you applied this patch as dc5e178f608f
> (contrib/buildsystems: drop support for building . vcproj/.vcxproj files,
> 2025-05-05). Notice the incorrect space between "." and "vcproj". Any idea
> where that came from?

It was almost a month ago.  

I have no idea and I only have one reflog entry on that topic branch
(meaning it is unlikely that it came from a manual editing).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant