##// END OF EJS Templates
packaging: rename hgrc.d to defaultrc for Windows config files next to the exe...
Matt Harbison -
r44614:e4344e46 5.3rc1 stable
parent child Browse files
Show More
@@ -45,7 +45,7 b' STAGING_RULES = ['
45 ('doc/*.html', 'doc/'),
45 ('doc/*.html', 'doc/'),
46 ('doc/style.css', 'doc/'),
46 ('doc/style.css', 'doc/'),
47 ('mercurial/helptext/**/*.txt', 'helptext/'),
47 ('mercurial/helptext/**/*.txt', 'helptext/'),
48 ('mercurial/defaultrc/*.rc', 'hgrc.d/'),
48 ('mercurial/defaultrc/*.rc', 'defaultrc/'),
49 ('mercurial/locale/**/*', 'locale/'),
49 ('mercurial/locale/**/*', 'locale/'),
50 ('mercurial/templates/**/*', 'Templates/'),
50 ('mercurial/templates/**/*', 'Templates/'),
51 ('COPYING', 'Copying.txt'),
51 ('COPYING', 'Copying.txt'),
@@ -232,7 +232,7 b' def stage_install('
232
232
233 # Write out a default editor.rc file to configure notepad as the
233 # Write out a default editor.rc file to configure notepad as the
234 # default editor.
234 # default editor.
235 with (staging_dir / 'hgrc.d' / 'editor.rc').open(
235 with (staging_dir / 'defaultrc' / 'editor.rc').open(
236 'w', encoding='utf-8'
236 'w', encoding='utf-8'
237 ) as fh:
237 ) as fh:
238 fh.write('[ui]\neditor = notepad\n')
238 fh.write('[ui]\neditor = notepad\n')
@@ -37,7 +37,7 b' EXTRA_PACKAGES = {'
37
37
38 EXTRA_INSTALL_RULES = [
38 EXTRA_INSTALL_RULES = [
39 ('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'),
39 ('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'),
40 ('contrib/win32/mercurial.ini', 'hgrc.d/mercurial.rc'),
40 ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
41 ]
41 ]
42
42
43 STAGING_REMOVE_FILES = [
43 STAGING_REMOVE_FILES = [
@@ -51,7 +51,7 b' Filename: {app}\\Mercurial.url; Section: '
51
51
52 [UninstallDelete]
52 [UninstallDelete]
53 Type: files; Name: {app}\Mercurial.url
53 Type: files; Name: {app}\Mercurial.url
54 Type: filesandordirs; Name: {app}\hgrc.d
54 Type: filesandordirs; Name: {app}\defaultrc
55
55
56 [Icons]
56 [Icons]
57 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
57 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
@@ -99,7 +99,7 b''
99 <ComponentRef Id='MainExecutable' />
99 <ComponentRef Id='MainExecutable' />
100 <ComponentRef Id='ProgramMenuDir' />
100 <ComponentRef Id='ProgramMenuDir' />
101 <ComponentGroupRef Id="hg.group.ROOT" />
101 <ComponentGroupRef Id="hg.group.ROOT" />
102 <ComponentGroupRef Id="hg.group.hgrc.d" />
102 <ComponentGroupRef Id="hg.group.defaultrc" />
103 <ComponentGroupRef Id="hg.group.helptext" />
103 <ComponentGroupRef Id="hg.group.helptext" />
104 <ComponentGroupRef Id="hg.group.lib" />
104 <ComponentGroupRef Id="hg.group.lib" />
105 <ComponentGroupRef Id="hg.group.templates" />
105 <ComponentGroupRef Id="hg.group.templates" />
General Comments 0
You need to be logged in to leave comments. Login now