Regenerate pywin32_swig.patch without Python 2 concerns#2694
Conversation
addf014 to
1bc88b3
Compare
|
This seems fine, but I guess we are going to want a new executable too? ie, I'm not sure it makes sense to land this if it means the exe and this patch are inconsistent? |
1bc88b3 to
a4ee61a
Compare
|
right, I see #2686 also wants to modify this. I guess this seems fine if it helps keep that ball rolling (although I wonder how far that ball will actually roll!) |
|
We can have a new executable yeah, I see your point. Even though it should work the same. If you don't wanna bother building a new one now, I could split up this PR into just fixing the patch and tool configs so git stops rejecting it. Btw I noticed my patch generation had quite a different style, idk if it's because whoever wrote the original patch maybe did it with a different tool than |
|
I suspect that patch predates git? But if you can verify locally the patch applies and makes a new executable which works I'm happy to have this merged |
|
Alright, I'll try to build SWIG locally and ensure that it still results in a valid pywin32 build. |
Me too. There's definitely some good changes from clin's attempt (like the new stable ABI functions for objects type and refcount). So I'll help take it piecemeal. |
|
I've had to fix include paths. I quickly did so by replacing But it did build a new Do you want me to include the minimal makefile changes as well ? Should I include the new swig executable in this PR or did you simply want me to make sure the patch was truly still valid ? |
I think you should include both if you don't mind. I'm not currently in a position to be able to regenerate the executables and you've been here long enough that I trust you to do that :) Thanks! |
|
@mhammond Full patches and updated executable included. |
MODINIT_ERROR_RETURNmacro usages withNULLMODINIT_ERROR_RETURNmacro) and minimal fix to makefiles for modern MSVCdifftool.--ignore-space-changeto avoind git thinking "this patch doesn't apply" due to line ending differencesWill reduce changes in #2686