From patchwork Sat Feb  1 06:48:21 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D8061: packaging: bundle the default mercurial.ini template with Inno
 also
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 44857
Message-Id: <differential-rev-PHID-DREV-ixjm7pgecclrkgahciuz-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Sat, 1 Feb 2020 06:48:21 +0000

mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This is a step towards converging on the same installer content on Windows.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  contrib/packaging/hgpackaging/inno.py

CHANGE DETAILS




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

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'):