Skip to content

Commit

Permalink
Remove workaround for issue #9762 (#12142)
Browse files Browse the repository at this point in the history
Latest version of Py2exe no longer invalidates signature of Python's dll so this workaround is no longer needed
  • Loading branch information
lukaszgo1 authored Mar 11, 2021
1 parent 06411a0 commit 9b1c16a
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions sconstruct
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# A part of NonVisual Desktop Access (NVDA)
# Copyright (C) 2010-2020 NV Access Limited, James Teh, Michael Curran, Peter Vágner, Joseph Lee, Reef Turner, Babbage B.V., Leonard de Ruijter, Łukasz Golonka, Accessolutions, Julien Cochuyt # noqa: E501
# Copyright (C) 2010-2021 NV Access Limited, James Teh, Michael Curran, Peter Vágner, Joseph Lee,
# Reef Turner, Babbage B.V., Leonard de Ruijter, Łukasz Golonka, Accessolutions, Julien Cochuyt
# This file may be used under the terms of the GNU General Public License, version 2 or later.
# For more details see: https://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -52,7 +53,6 @@ import sourceEnv
sys.path.remove(sourceEnvPath)
import time
from glob import glob
from py2exe.dllfinder import pydll
import importlib.util
import winreg

Expand Down Expand Up @@ -308,11 +308,6 @@ def NVDADistGenerator(target, source, env, for_signature):

action.append(buildCmd)

# Python3 has started signing its main python dll.
# However, Py2exe currently tries to add a string resource to it, invalidating the signature and possibly currupting the certificate.
# Therefore, copy a fresh version of the dll one more time once py2exe has completed.
action.append(Copy(target[0],pydll))

# #10031: Apps written in Python 3 require Universal CRT to be installed. We cannot assume users have it on their systems.
# Therefore , copy required libraries from Windows 10 SDK.
try:
Expand Down

0 comments on commit 9b1c16a

Please sign in to comment.