This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6096

wix: move contrib/wix to contrib/packaging/wix
ClosedPublic

Authored by indygreg on Mar 8 2019, 1:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc68a1df5c79a: wix: move contrib/wix to contrib/packaging/wix
Summary

We're trying to consolidate all our packaging code into
contrib/packaging. Let's move the WiX files there.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Mar 8 2019, 1:49 PM
Closed by commit rHGc68a1df5c79a: wix: move contrib/wix to contrib/packaging/wix (authored by indygreg). · Explain WhyMar 9 2019, 8:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14406

contrib/packaging/wix/COPYING.rtf

  • This file was moved from contrib/wix/COPYING.rtf.

contrib/packaging/wix/README.txt

  • This file was moved from contrib/wix/README.txt.

contrib/packaging/wix/contrib.wxs

  • This file was moved from contrib/wix/contrib.wxs.

contrib/packaging/wix/defines.wxi

  • This file was moved from contrib/wix/defines.wxi.

contrib/packaging/wix/dist.wxs

  • This file was moved from contrib/wix/dist.wxs.

contrib/packaging/wix/doc.wxs

  • This file was moved from contrib/wix/doc.wxs.

contrib/packaging/wix/guids.wxi

  • This file was moved from contrib/wix/guids.wxi.

contrib/packaging/wix/help.wxs

  • This file was moved from contrib/wix/help.wxs.

contrib/packaging/wix/i18n.wxs

  • This file was moved from contrib/wix/i18n.wxs.

contrib/packaging/wix/locale.wxs

  • This file was moved from contrib/wix/locale.wxs.

contrib/packaging/wix/mercurial.wxs

  • This file was moved from contrib/wix/mercurial.wxs.
<Environment Id="Environment" Name="PATH" Part="last" System="yes" <Environment Id="Environment" Name="PATH" Part="last" System="yes"
Permanent="no" Value="[INSTALLDIR]" Action="set" /> Permanent="no" Value="[INSTALLDIR]" Action="set" />
</Component> </Component>
<Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'> <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'>
<File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html' <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
KeyPath='yes'/> KeyPath='yes'/>
</Component> </Component>
<Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'> <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
<File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf' <File Id='COPYING' Name='COPYING.rtf' Source='contrib\packaging\wix\COPYING.rtf'
KeyPath='yes'/> KeyPath='yes'/>
</Component> </Component>
<Directory Id='HGRCD' Name='hgrc.d'> <Directory Id='HGRCD' Name='hgrc.d'>
<Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'> <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'/> ReadOnly='yes' KeyPath='yes'/>
</Component> </Component>
<Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'> <Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'>
<ComponentGroupRef Id='contribFolder' /> <ComponentGroupRef Id='contribFolder' />
</Feature> </Feature>
</Feature> </Feature>
<UIRef Id="WixUI_FeatureTree" /> <UIRef Id="WixUI_FeatureTree" />
<UIRef Id="WixUI_ErrorProgressText" /> <UIRef Id="WixUI_ErrorProgressText" />
<WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" /> <WixVariable Id="WixUILicenseRtf" Value="contrib\packaging\wix\COPYING.rtf" />
<Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" /> <Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />
<Upgrade Id='$(var.ProductUpgradeCode)'> <Upgrade Id='$(var.ProductUpgradeCode)'>
<UpgradeVersion <UpgradeVersion
IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' OnlyDetect='no' IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' OnlyDetect='no'
Property='INSTALLEDMERCURIALPRODUCTS' /> Property='INSTALLEDMERCURIALPRODUCTS' />
</Upgrade> </Upgrade>
<InstallExecuteSequence> <InstallExecuteSequence>
<RemoveExistingProducts After='InstallInitialize'/> <RemoveExistingProducts After='InstallInitialize'/>
</InstallExecuteSequence> </InstallExecuteSequence>
</Product> </Product>
</Wix> </Wix>

contrib/packaging/wix/templates.wxs

  • This file was moved from contrib/wix/templates.wxs.

contrib/wix/COPYING.rtf

  • This file was moved to contrib/packaging/wix/COPYING.rtf.

contrib/wix/README.txt

  • This file was moved to contrib/packaging/wix/README.txt.

contrib/wix/contrib.wxs

  • This file was moved to contrib/packaging/wix/contrib.wxs.

contrib/wix/defines.wxi

  • This file was moved to contrib/packaging/wix/defines.wxi.

contrib/wix/dist.wxs

  • This file was moved to contrib/packaging/wix/dist.wxs.

contrib/wix/doc.wxs

  • This file was moved to contrib/packaging/wix/doc.wxs.

contrib/wix/guids.wxi

  • This file was moved to contrib/packaging/wix/guids.wxi.

contrib/wix/help.wxs

  • This file was moved to contrib/packaging/wix/help.wxs.

contrib/wix/i18n.wxs

  • This file was moved to contrib/packaging/wix/i18n.wxs.

contrib/wix/locale.wxs

  • This file was moved to contrib/packaging/wix/locale.wxs.

contrib/wix/mercurial.wxs

  • This file was moved to contrib/packaging/wix/mercurial.wxs.

contrib/wix/templates.wxs

  • This file was moved to contrib/packaging/wix/templates.wxs.

tests/test-install.t

> for line in output.splitlines(): > for line in output.splitlines():
> if os.name == 'nt': > if os.name == 'nt':
> yield line.replace(pycompat.sysbytes(os.sep), b'/') > yield line.replace(pycompat.sysbytes(os.sep), b'/')
> else: > else:
> yield line > yield line
> >
> tracked = [f for f in hgdirectory(sys.argv[1])] > tracked = [f for f in hgdirectory(sys.argv[1])]
> >
> xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1])) > xml = ET.parse("%s/../contrib/packaging/wix/%s.wxs" % (testdir, sys.argv[1]))
> root = xml.getroot() > root = xml.getroot()
> dir = root.find('.//{%(wix)s}DirectoryRef' % ns) > dir = root.find('.//{%(wix)s}DirectoryRef' % ns)
> >
> installed = [f for f in directory(dir, '')] > installed = [f for f in directory(dir, '')]
> >
> print('Not installed:') > print('Not installed:')
> for f in sorted(set(tracked) - set(installed)): > for f in sorted(set(tracked) - set(installed)):
> print(' %s' % pycompat.sysstr(f)) > print(' %s' % pycompat.sysstr(f))