Skip to content

Windows makefile generator: Don't delete long lists of files in one go#11171

Merged
openssl-machine merged 1 commit intoopenssl:masterfrom
levitte:fix-11163
Mar 31, 2020
Merged

Windows makefile generator: Don't delete long lists of files in one go#11171
openssl-machine merged 1 commit intoopenssl:masterfrom
levitte:fix-11163

Conversation

@levitte
Copy link
Copy Markdown
Member

@levitte levitte commented Feb 25, 2020

The Windows command line has its limits, and we're hitting it hard.
We therefore generate one 'del' command for each explicit file for the
'clean' target.

Fixes #11163

@levitte levitte added branch: master Applies to master branch approval: review pending This pull request needs review by a committer labels Feb 25, 2020
@levitte levitte added this to the 3.0.0 milestone Feb 25, 2020
@levitte
Copy link
Copy Markdown
Member Author

levitte commented Feb 25, 2020

Currently in WIP because I haven't tested it yet.

Shouldn't we have an Appveyor job trying nmake clean? (or Travis trying make clean, for that matter?)

@mspncp
Copy link
Copy Markdown
Contributor

mspncp commented Feb 25, 2020

Couldn't we try to use wildcard deletes as much as possible? Deleting every single file separately is so painfully slooow on windows...

@levitte
Copy link
Copy Markdown
Member Author

levitte commented Feb 25, 2020

No. We do too much of that already. People who build in the source tree run too much risk of losing their work. We have already had that issue

@bernd-edlinger
Copy link
Copy Markdown
Member

I have also tried to solve that long line issue: #10895

@openssl-machine
Copy link
Copy Markdown
Collaborator

This issue is in a state where it requires action by @openssl/committers but the last update was 30 days ago

@kaduk
Copy link
Copy Markdown
Contributor

kaduk commented Mar 28, 2020

@iamamoose Hmm, maybe reminding for PRs that still have a [WIP] tag is overzealous...

@bernd-edlinger
Copy link
Copy Markdown
Member

I wonder why my #10895 is being ignored, that is not WIP,
but I have not been testing that since weeks because I don't like to waste my time.

@iamamoose
Copy link
Copy Markdown
Member

@iamamoose Hmm, maybe reminding for PRs that still have a [WIP] tag is overzealous...

It could certainly ignore things with WIP in the title, but would be better if the labels held the state, perhaps a WIP label?

@mspncp
Copy link
Copy Markdown
Contributor

mspncp commented Mar 28, 2020

The labels are not visible in the notification area, but the WIP prefix is.

@richsalz
Copy link
Copy Markdown
Contributor

And non-members can set the title, but they cannot set labels.

@levitte levitte changed the title [WIP] Windows makefile generator: Don't delete long lists of files in one go Windows makefile generator: Don't delete long lists of files in one go Mar 29, 2020
@levitte
Copy link
Copy Markdown
Member Author

levitte commented Mar 29, 2020

There's no reason for it to be WIP any more (hasn't been for a while)

@levitte levitte mentioned this pull request Mar 29, 2020
Copy link
Copy Markdown
Contributor

@mspncp mspncp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I compared the generated makefiles (this commit versus its ancestor), the changes look reasonable. Also, I verified that this pull request fixes the nmake clean issue #11163.

@mspncp mspncp added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Mar 29, 2020
@openssl-machine
Copy link
Copy Markdown
Collaborator

24 hours has passed since 'approval: done' was set, but this PR has failing CI tests. Once the tests pass it will get moved to 'approval: ready to merge' automatically, alternatively please review and set the label manually.

@levitte levitte added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Mar 31, 2020
The Windows command line has its limits, and we're hitting it hard.
We therefore generate one 'del' command for each explicit file for the
'clean' target.

Fixes openssl#11163

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from openssl#11171)
@openssl-machine openssl-machine merged commit f4c8807 into openssl:master Mar 31, 2020
@levitte levitte deleted the fix-11163 branch March 31, 2020 13:40
@bernd-edlinger
Copy link
Copy Markdown
Member

Have you also fixed the nmake distclean ?

@bernd-edlinger
Copy link
Copy Markdown
Member

And, why is everyone force-pushing after the approval ?
That means nobody can ever do

git fetch git://github.com/openssl/openssl.git refs/pull/11171/head:pr-11171-as-approved

to get the version as it was approved.
I know I can trust you, but you know it quite well, "Vertrauen ist gut, Kontrolle ist besser."

@slontis
Copy link
Copy Markdown
Member

slontis commented Apr 1, 2020

Its normally because a rebase is needed.

@bernd-edlinger
Copy link
Copy Markdown
Member

Yes, but then the rebase should be done, and a new approval requested.
But recently everybody started to rebase without any need, just to get the
gitbub icon that shows a merge. Everytime I merge one of my commits,
github says "unmerged commits" but I comment, that I merged the code
and close the PR. Even if my branch is deleted later what I dont do,
the pull request stays to be retrievable with above work flow.

@levitte
Copy link
Copy Markdown
Member Author

levitte commented Apr 1, 2020

And, why is everyone force-pushing after the approval ?

Everyone? I think that I've only seen me and @DDvO do this so far. Basically, it allows github to notice and to make that "Merged" status and notification for us.

@bernd-edlinger
Copy link
Copy Markdown
Member

I already asked @DDvO to stop doing that. Now I ask you.
We do not need to make github happy, github is optional.

@levitte
Copy link
Copy Markdown
Member Author

levitte commented Apr 1, 2020

It made me happy too, FYI. Also, it does make it clearer what PRs are closed because they were abandoned, which does happen for various reasons.

@bernd-edlinger
Copy link
Copy Markdown
Member

Okay, I made my point, just do what you want then.

@bernd-edlinger
Copy link
Copy Markdown
Member

bernd-edlinger commented Apr 1, 2020

When I merge a PR I always close with a comment that I merged it.
And due to the (Merged from https://github.com/openssl/openssl/pull/11425)
The merge commit appears in the history of the PR
(I only broke it once, when I had a typo in the addrev command,
and did not notice before pushing). I took precautions in my workflow
to make sure that cannot happen again.

@DDvO
Copy link
Copy Markdown
Contributor

DDvO commented Aug 4, 2020

When I merge a PR I always close with a comment that I merged it.

I also do this to make clear that I did not close the PR for other reasons.

And due to the (Merged from https://github.com/openssl/openssl/pull/11425)
The merge commit appears in the history of the PR

Well, the PR appears in the history of the master branch due to the Merged from ... line,
but the approved commits of the PR do not show show identically in the master
because the commit messages have been amended by reviewer and PR number info
and typically the commits have been rebased immediately before merging.

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

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

'nmake clean' stops with fatal error U1095: expanded command line 'commandline' too long

9 participants