On 2011-07-18 10:27, [email protected] wrote: > Hi, > > I'm trying to add new files to the TortoiseHG distribution for the internal > use at Lantiq. When everything works the files could be part of the hglock > extension[1]. After installing TortoiseHG the files should appear in a new > directory "hglock" in the "contrib" directory. I added the following patch to > the hg-stable repository I'm using for the build: > > diff --git a/contrib/wix/contrib.wxs b/contrib/wix/contrib.wxs > --- a/contrib/wix/contrib.wxs > +++ b/contrib/wix/contrib.wxs > @@ -7,6 +7,7 @@ > <Fragment> > <ComponentGroup Id="contribFolder"> > <ComponentRef Id="contrib" /> > + <ComponentRef Id="contrib.hglock" /> > <ComponentRef Id="contrib.vim" /> > </ComponentGroup> > </Fragment> > @@ -27,6 +28,17 @@ > <File Name="xml.rnc" /> > <File Name="zsh_completion" /> > </Component> > + <Directory Id="hglockdir" Name="hglock"> > + <Component Id="contrib.hglock" Guid="$(var.contrib.hglock.guid)" > Win6 > 4='$(var.IsX64)'> > + <File Name="hg_lock.bat" KeyPath="yes" /> > + <File Name="hg_lock_force.bat" /> > + <File Name="hg_locks.bat" /> > + <File Name="hg_unlock.bat" /> > + <File Name="hg_unlock_force.bat" /> > + <File Name="hglock_shortcuts.zip" /> > + <File Name="README.txt" /> > + </Component> > + </Directory> > <Directory Id="vimdir" Name="vim"> > <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" > Win64='$(v > ar.IsX64)'> > <File Name="hg-menu.vim" KeyPath="yes" /> > diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi > --- a/contrib/wix/guids.wxi > +++ b/contrib/wix/guids.wxi > @@ -6,6 +6,7 @@ > > <!-- contrib.wxs --> > <?define contrib.guid = {F17D27B7-4A6B-4cd2-AE72-FED3CFAA585E} ?> > + <?define contrib.hglock.guid = {3ABE93E4-95C4-4233-9F31-22CEB9FC369E} ?> > <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?> > > <!-- dist.wxs --> > > I created the GUID using the GUID Generator. I also added the files added to > "contrib.wix" to the repository and tagged the new commit so that it will be > used by setup.py of thg-winbuild. > > Unfortunately the files are not part of the MSI. > > Have I forgotten anything? Why are the files not part of the MSI? > > > Regards > > Markus > > [1] https://bitbucket.org/aragost/hglock/
Did you look into the right files? The msi build for TortoiseHg uses its own contrib.wxs and guids.wxi https://bitbucket.org/tortoisehg/thg/src/6b4103d9c71c/win32/wix/contrib.wxs https://bitbucket.org/tortoisehg/thg/src/6b4103d9c71c/win32/wix/guids.wxi which are not the same ones that are used for building the mercurial msi http://selenic.com/repo/hg/file/946f4381c1cb/contrib/wix/contrib.wxs http://selenic.com/repo/hg/file/946f4381c1cb/contrib/wix/guids.wxi (I know it's pretty confusing, but I'm not the inventor of that layout :-) ------------------------------------------------------------------------------ AppSumo Presents a FREE Video for the SourceForge Community by Eric Ries, the creator of the Lean Startup Methodology on "Lean Startup Secrets Revealed." This video shows you how to validate your ideas, optimize your ideas and identify your business strategy. http://p.sf.net/sfu/appsumosfdev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
