D8061: packaging: bundle the default mercurial.ini template with Inno also

[mharbison72 (Matt Harbison)]

Closed by commit rHGa8786727e478: packaging: bundle the default mercurial.ini template with Inno also (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8061?vs=19808&id=19821

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8061/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8061

AFFECTED FILES
  contrib/packaging/hgpackaging/inno.py

CHANGE DETAILS

diff --git a/contrib/packaging/hgpackaging/inno.py b/contrib/packaging/hgpackaging/inno.py
--- a/contrib/packaging/hgpackaging/inno.py
+++ b/contrib/packaging/hgpackaging/inno.py
@@ -21,6 +21,7 @@
 from .util import (
     find_vc_runtime_files,
     normalize_windows_version,
+    process_install_rules,
     read_version_py,
 )
 
@@ -31,6 +32,10 @@
     'win32ctypes',
 }
 
+EXTRA_INSTALL_RULES = [
+    ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
+]
+
 PACKAGE_FILES_METADATA = {
     'ReadMe.html': 'Flags: isreadme',
 }
@@ -84,6 +89,9 @@
     # Now assemble all the packaged files into the staging directory.
     stage_install(source_dir, staging_dir)
 
+    # We also install some extra files.
+    process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir)
+
     # hg.exe depends on VC9 runtime DLLs. Copy those into place.
     for f in find_vc_runtime_files(vc_x64):
         if f.name.endswith('.manifest'):



To: mharbison72, #hg-reviewers, indygreg
Cc: mercurial-devel