Closed by commit rHG11db74349b24: packaging: use lower case for RC files (authored by indygreg). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7172?vs=17393&id=18025 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7172/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7172 AFFECTED FILES contrib/packaging/wix/guids.wxi contrib/packaging/wix/mercurial.wxs CHANGE DETAILS diff --git a/contrib/packaging/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs --- a/contrib/packaging/wix/mercurial.wxs +++ b/contrib/packaging/wix/mercurial.wxs @@ -75,11 +75,11 @@ <Directory Id='HGRCD' Name='hgrc.d'> <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'> - <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini' + <File Id='mercurial.rc' Name='mercurial.rc' Source='contrib\win32\mercurial.ini' ReadOnly='yes' KeyPath='yes'/> </Component> <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'> - <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' + <File Id='mergetools.rc' Name='mergetools.rc' Source='mercurial\default.d\mergetools.rc' ReadOnly='yes' KeyPath='yes'/> </Component> </Directory> diff --git a/contrib/packaging/wix/guids.wxi b/contrib/packaging/wix/guids.wxi --- a/contrib/packaging/wix/guids.wxi +++ b/contrib/packaging/wix/guids.wxi @@ -42,8 +42,8 @@ <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?> <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> - <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> - <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> + <?define mercurial.rc.guid = {52BBF223-58F6-47F5-9353-8FDEA88D9B8D} ?> + <?define mergetools.rc.guid = {5AF0430B-2B76-4BC6-91EE-E771B74A0214} ?> <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> </Include> To: indygreg, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
