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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b80bf
bpo-37468: make install no longer install wininst-*.exe files
vstinner Jul 1, 2019
abff729
Move the comment
vstinner Jul 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
Expand All @@ -1431,6 +1433,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
*CVS) ;; \
*.py[co]) ;; \
*.orig) ;; \
*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.

*~) ;; \
*) \
if test -d $$i; then continue; fi; \
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2019-07-01-14-39-40.bpo-37468.trbQ-_.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``make install`` no longer installs ``wininst-*.exe`` files used by
distutils bdist_wininst: bdist_wininst only works on Windows.