bpo-41054: Simplify resource compilation on Windows #21004
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove auto-generated resource header. Pass definitions required by resource files (PYTHON_DLL_NAME and FIELD3) directly to resource compiler. Remove unused MS_DLL_ID resource string and related dead code.
zooba
reviewed
Jun 22, 2020
PCbuild/pyproject.props
Outdated
| @@ -80,7 +80,7 @@ | |||
| </Lib> | |||
| <ResourceCompile> | |||
| <AdditionalIncludeDirectories>$(PySourcePath)PC;$(PySourcePath)Include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
| <PreprocessorDefinitions>$(_DebugPreprocessorDefinition)%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
| <PreprocessorDefinitions>PYTHON_DLL_NAME=\"$(TargetName)$(TargetExt)\";FIELD3=$(Field3Value);$(_DebugPreprocessorDefinition)%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
There was a problem hiding this comment.
Let's rename PYTHON_DLL_NAME to ORIGINAL_FILENAME, since that's how it's used.
|
I had more comments that I eventually unrolled, but since I spent 10-15 minutes figuring out that |
|
I'm not sure if I should squash and rebase ot just add commits to the aging branch. |
|
Adding commits is preferred - we squash merge and rewrite commit messages at the end. Doing it during a PR breaks all the reviews up to that point. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this issue
Jun 23, 2020
Remove auto-generated resource header. Pass definitions required by resource files (ORIGINAL_FILENAME and FIELD3) directly to resource compiler. Remove unused MS_DLL_ID resource string and related dead code. (cherry picked from commit 4efc336) Co-authored-by: Nikita Nemkin <nikita@nemkin.ru>
|
GH-21091 is a backport of this pull request to the 3.9 branch. |
miss-islington
added a commit
that referenced
this issue
Jun 23, 2020
Remove auto-generated resource header. Pass definitions required by resource files (ORIGINAL_FILENAME and FIELD3) directly to resource compiler. Remove unused MS_DLL_ID resource string and related dead code. (cherry picked from commit 4efc336) Co-authored-by: Nikita Nemkin <nikita@nemkin.ru>
fasih
pushed a commit
to fasih/cpython
that referenced
this issue
Jun 29, 2020
Remove auto-generated resource header. Pass definitions required by resource files (ORIGINAL_FILENAME and FIELD3) directly to resource compiler. Remove unused MS_DLL_ID resource string and related dead code.
arun-mani-j
pushed a commit
to arun-mani-j/cpython
that referenced
this issue
Jul 21, 2020
Remove auto-generated resource header. Pass definitions required by resource files (ORIGINAL_FILENAME and FIELD3) directly to resource compiler. Remove unused MS_DLL_ID resource string and related dead code.
chrisburr
pushed a commit
to chrisburr/cpython
that referenced
this issue
Dec 9, 2020
Remove auto-generated resource header. Pass definitions required by resource files (ORIGINAL_FILENAME and FIELD3) directly to resource compiler. Remove unused MS_DLL_ID resource string and related dead code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Remove auto-generated resource header. Pass definitions required by resource files (
PYTHON_DLL_NAMEandFIELD3) directly to resource compiler.Remove unused
MS_DLL_IDresource string and related dead code.https://bugs.python.org/issue41054