| Submitter | Matt Harbison |
|---|---|
| Date | Dec. 18, 2015, 2:26 a.m. |
| Message ID | <79c3d4dbeac2208560a3.1450405587@Envy> |
| Download | mbox | patch |
| Permalink | /patch/12137/ |
| State | Changes Requested |
| Delegated to: | Yuya Nishihara |
| Headers | show |
Comments
On Thu, Dec 17, 2015 at 09:26:27PM -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1450405448 18000 > # Thu Dec 17 21:24:08 2015 -0500 > # Node ID 79c3d4dbeac2208560a399b76db9ba9039e9e2d8 > # Parent c63a117963ebcbada5e359cdc60ad5112d0a14cd > wix: add help for bundle and changegroup topics These look fine to me, but I'd like someone with Windows experience to squint at it. Steve? > > This makes the changes in a79cba6cb206 and 84784f834b3a available on Windows. > > I'm not setup to make the installer, so someone with experience in this area > should probably give it a look. > > diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs > --- a/contrib/wix/help.wxs > +++ b/contrib/wix/help.wxs > @@ -8,6 +8,8 @@ > <DirectoryRef Id="INSTALLDIR"> > <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)"> > <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'> > + <File Name="internals/bundles.txt" /> > + <File Name="internals/changegroups.txt" /> > <File Name="config.txt" KeyPath="yes" /> > <File Name="dates.txt" /> > <File Name="diffs.txt" /> > diff --git a/tests/test-install.t b/tests/test-install.t > --- a/tests/test-install.t > +++ b/tests/test-install.t > @@ -102,8 +102,6 @@ > help/hg.1.txt > help/hgignore.5.txt > help/hgrc.5.txt > - help/internals/bundles.txt > - help/internals/changegroups.txt > Not tracked: > > $ python wixxml.py templates > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
On Thu, 17 Dec 2015 21:26:27 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1450405448 18000 > # Thu Dec 17 21:24:08 2015 -0500 > # Node ID 79c3d4dbeac2208560a399b76db9ba9039e9e2d8 > # Parent c63a117963ebcbada5e359cdc60ad5112d0a14cd > wix: add help for bundle and changegroup topics > > This makes the changes in a79cba6cb206 and 84784f834b3a available on Windows. > > I'm not setup to make the installer, so someone with experience in this area > should probably give it a look. > > diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs > --- a/contrib/wix/help.wxs > +++ b/contrib/wix/help.wxs > @@ -8,6 +8,8 @@ > <DirectoryRef Id="INSTALLDIR"> > <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)"> > <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'> > + <File Name="internals/bundles.txt" /> > + <File Name="internals/changegroups.txt" /> Guessing from templates.wxs, File element can't include a directory separator. I've pushed only the first patch, thanks.
Patch
diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs --- a/contrib/wix/help.wxs +++ b/contrib/wix/help.wxs @@ -8,6 +8,8 @@ <DirectoryRef Id="INSTALLDIR"> <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)"> <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'> + <File Name="internals/bundles.txt" /> + <File Name="internals/changegroups.txt" /> <File Name="config.txt" KeyPath="yes" /> <File Name="dates.txt" /> <File Name="diffs.txt" /> diff --git a/tests/test-install.t b/tests/test-install.t --- a/tests/test-install.t +++ b/tests/test-install.t @@ -102,8 +102,6 @@ help/hg.1.txt help/hgignore.5.txt help/hgrc.5.txt - help/internals/bundles.txt - help/internals/changegroups.txt Not tracked: $ python wixxml.py templates