Skip to content
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

Vendor h2py to regenerate scintillacon.py #2429

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

Avasam
Copy link
Collaborator

@Avasam Avasam commented Nov 18, 2024

h2py is no longer included in Python as of Python 3.9

Personally I'd rather this doesn't happen on every build, so I updated the make all target to not include this script.

SCN_CHECKBRACE and SC_FOLDLEVELBOXFOOTERFLAG got removed in Scintilla 1.79
Also in 1.21:

SCN_CHECKBRACE renamed SCN_UPDATEUI and made more efficient.

Comment on lines +13 to +14
# PYTHON is set in make.py, defaulting to the one found on PATH
PYTHON = python
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@@ -453,7 +453,6 @@ def _build_scintilla(self):
assert os.path.isdir(build_temp), build_temp
makeargs.append("SUB_DIR_O=%s" % build_temp)
makeargs.append("SUB_DIR_BIN=%s" % build_temp)
makeargs.append("DIR_PYTHON=%s" % sys.prefix)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

If you'd like to restore the functionality of regenerating scintillacon.py on every rebuild I can do it, I just need to add a line like
powershell -Command "(Get-Content '..\pywin\scintilla\scintillacon.py' | Where-Object { -not $$_.StartsWith('def ') }) | Set-Content '..\pywin\scintilla\scintillacon.py'" to the makefile because for some reason under this context h2py finds and adds more definitions, namely broken callables.

@Avasam Avasam requested a review from mhammond November 18, 2024 06:11
@Avasam Avasam marked this pull request as ready for review November 18, 2024 06:11
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.

1 participant