From patchwork Fri Oct 25 03:34:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D7168: packaging: install .rc files to hgrc.d From: phabricator X-Patchwork-Id: 42582 Message-Id: <3441ef501434ea1ee72e26c6f2fad372@localhost.localdomain> To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Fri, 25 Oct 2019 03:34:39 +0000 indygreg updated this revision to Diff 17402. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7168?vs=17389&id=17402 BRANCH stable CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7168/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7168 AFFECTED FILES contrib/packaging/hgpackaging/py2exe.py contrib/packaging/inno/mercurial.iss CHANGE DETAILS To: indygreg, #hg-reviewers Cc: mharbison72, mercurial-devel diff --git a/contrib/packaging/inno/mercurial.iss b/contrib/packaging/inno/mercurial.iss --- a/contrib/packaging/inno/mercurial.iss +++ b/contrib/packaging/inno/mercurial.iss @@ -48,11 +48,11 @@ [INI] Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/ -Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad +Filename: {app}\hgrc.d\editor.rc; Section: ui; Key: editor; String: notepad [UninstallDelete] Type: files; Name: {app}\Mercurial.url -Type: filesandordirs; Name: {app}\default.d +Type: filesandordirs; Name: {app}\hgrc.d [Icons] Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} diff --git a/contrib/packaging/hgpackaging/py2exe.py b/contrib/packaging/hgpackaging/py2exe.py --- a/contrib/packaging/hgpackaging/py2exe.py +++ b/contrib/packaging/hgpackaging/py2exe.py @@ -45,7 +45,7 @@ ('doc/*.html', 'doc/'), ('doc/style.css', 'doc/'), ('mercurial/help/**/*.txt', 'help/'), - ('mercurial/default.d/*.rc', 'default.d/'), + ('mercurial/default.d/*.rc', 'hgrc.d/'), ('mercurial/locale/**/*', 'locale/'), ('mercurial/templates/**/*', 'Templates/'), ('CONTRIBUTORS', 'Contributors.txt'),