Skip to content

bpo-37468: make install no longer install wininst-*.exe files #14511

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

Merged
merged 2 commits into from
Jul 15, 2019
Merged

bpo-37468: make install no longer install wininst-*.exe files #14511

merged 2 commits into from
Jul 15, 2019

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Jul 1, 2019

make install no longer installs "wininst-*.exe" files used by
distutils bdist_wininst: bdist_wininst only works on Windows.

https://bugs.python.org/issue37468

make install no longer installs "wininst-*.exe" files used by
distutils bdist_wininst: bdist_wininst only works on Windows.
@vstinner
Copy link
Member Author

vstinner commented Jul 2, 2019

cc @pganssle

Makefile.pre.in Outdated
@@ -1419,6 +1419,8 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@# bpo-37468: Don't install distutils/command/wininst-*.exe files used
@# by distutils bdist_wininst: bdist_wininst only works on Windows.
Copy link
Member

Choose a reason for hiding this comment

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

Should this comment be above line 1436? This for loop does other stuff, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wasn't sure if it is possible to put comments into this loop which uses \ at end of lines for multiline expression. It looks like it works, so I moved the comment inside the loop.

Copy link
Member

@pganssle pganssle left a comment

Choose a reason for hiding this comment

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

I'm assuming that the Make file can't (or at least isn't intended to) be executed on Windows anyway, then I think this is a good idea.

I had one nitpicky suggestion about where the comment should go, but I don't think I need to withhold approval based on that. @vstinner If you disagree with my suggestion about where the comment should go, feel free to merge.

@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2019

I'm assuming that the Make file can't (or at least isn't intended to) be executed on Windows anyway, then I think this is a good idea.

I don't know how if things like Cygwin or MinGW can build Python using Makefile. I don't know if Cygwin is supported or not (I don't think so).

@pganssle
Copy link
Member

pganssle commented Jul 4, 2019

I don't know how if things like Cygwin or MinGW can build Python using Makefile. I don't know if Cygwin is supported or not (I don't think so).

I'm no expert in either of those things, but I think that Cygwin is kind of like WSL in that it can and does use make, but it wouldn't have much use for Windows executable files anyway as it's more like a Linux distribution.

@vstinner vstinner merged commit e869281 into python:master Jul 15, 2019
@vstinner vstinner deleted the dont_install_wininst_exe branch July 15, 2019 15:18
@@ -1431,6 +1431,9 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
*CVS) ;; \
*.py[co]) ;; \
*.orig) ;; \
# bpo-37468: Don't install distutils/command/wininst-*.exe files used \
# by distutils bdist_wininst: bdist_wininst only works on Windows. \
*wininst-*.exe) ;; \
Copy link
Member

Choose a reason for hiding this comment

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

Adding comments here breaks make libinstall and hence make install, at least for some types of make. Fixed by bpo-37653 / #14911.

lisroach pushed a commit to lisroach/cpython that referenced this pull request Sep 10, 2019
…GH-14511)

make install no longer installs "wininst-*.exe" files used by
distutils bdist_wininst: bdist_wininst only works on Windows.
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
…GH-14511)

make install no longer installs "wininst-*.exe" files used by
distutils bdist_wininst: bdist_wininst only works on Windows.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants