changeset 46351:5b747aa1b2be stable

packaging: include `windows_curses` when building py2exe The `_curses.pyd` module was previously being included by py2exe's module search, but it left out `_curses_panel.pyd`. Differential Revision: https://phab.mercurial-scm.org/D9857
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 24 Jan 2021 19:14:50 -0500
parents d6cfe45afb18
children 3df00f905458
files contrib/packaging/hgpackaging/inno.py contrib/packaging/hgpackaging/wix.py
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/packaging/hgpackaging/inno.py	Sun Jan 24 19:08:47 2021 -0500
+++ b/contrib/packaging/hgpackaging/inno.py	Sun Jan 24 19:14:50 2021 -0500
@@ -33,6 +33,11 @@
     'win32ctypes',
 }
 
+EXTRA_INCLUDES = {
+    '_curses',
+    '_curses_panel',
+}
+
 EXTRA_INSTALL_RULES = [
     ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
 ]
@@ -78,6 +83,7 @@
         'inno',
         requirements_txt,
         extra_packages=EXTRA_PACKAGES,
+        extra_includes=EXTRA_INCLUDES,
     )
 
     # Purge the staging directory for every build so packaging is
--- a/contrib/packaging/hgpackaging/wix.py	Sun Jan 24 19:08:47 2021 -0500
+++ b/contrib/packaging/hgpackaging/wix.py	Sun Jan 24 19:14:50 2021 -0500
@@ -39,6 +39,10 @@
     'win32ctypes',
 }
 
+EXTRA_INCLUDES = {
+    '_curses',
+    '_curses_panel',
+}
 
 EXTRA_INSTALL_RULES = [
     ('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'),
@@ -330,6 +334,7 @@
         requirements_txt,
         extra_packages=EXTRA_PACKAGES,
         extra_packages_script=extra_packages_script,
+        extra_includes=EXTRA_INCLUDES,
     )
 
     build_dir = hg_build_dir / ('wix-%s' % arch)