##// END OF EJS Templates
perf: call _generatechangelog() instead of group()...
perf: call _generatechangelog() instead of group() Now that we have a separate function for generating just the changelog bits, the perf command should call it so it gets more accurate behavior. This changes the results of this command on my hg repo significantly: ! wall 1.390502 comb 1.390000 user 1.370000 sys 0.020000 (best of 8) ! wall 1.768750 comb 1.760000 user 1.760000 sys 0.000000 (best of 6) Profiling seems to reveal that ~20% of execution time is spent in progress bar accounting and printing! If we run with progress.disable=true: ! wall 1.639134 comb 1.650000 user 1.630000 sys 0.020000 (best of 7) A nice speedup. But profiling still shows a good chunk of time being spent in progress bar accounting code. The reason is that the progress bar is conditionally enabled via an argument to cgpacker.group(). The previous code in perf.py calling into group() did not enable the progress bar but _generatechangelog() always does. I think it is important for the perf* commands to capture real-world use cases. And this code always runs with an active progress bar. So the regression is acceptable. That being said, terminal printing performance can vary substantially. I don't think perf* commands should test terminal printing unless explicitly desired. So I've disabled progress bar printing in this command. Differential Revision: https://phab.mercurial-scm.org/D4134

File last commit:

r30888:561a019c stable
r39013:a1f69477 default
Show More
mercurial.wxs
162 lines | 7.0 KiB | text/plain | TextLexer
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<!-- Copyright 2010 Steve Borho <steve@borho.org>
This software may be used and distributed according to the terms of the
GNU General Public License version 2 or any later version. -->
Adrian Buehlmann
wix updates...
r10930 <?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <?if $(var.Platform) = "x64" ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?define PFolder = ProgramFiles64Folder ?>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <?else?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?define PFolder = ProgramFilesFolder ?>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <?endif?>
Adrian Buehlmann
wix updates...
r10930 <Product Id='*'
Mads Kiilerich
codingstyle: remove trailing spaces in various text files...
r19023 Name='Mercurial $(var.Version) ($(var.Platform))'
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 UpgradeCode='$(var.ProductUpgradeCode)'
Adrian Buehlmann
wix updates...
r10930 Language='1033' Codepage='1252' Version='$(var.Version)'
Manufacturer='Matt Mackall and others'>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513
Adrian Buehlmann
wix updates...
r10930 <Package Id='*'
Keywords='Installer'
Description="Mercurial distributed SCM (version $(var.Version))"
Comments='$(var.Comments)'
Steve Borho
wix: add support for x64 native MSI packages
r13042 Platform='$(var.Platform)'
Adrian Buehlmann
wix updates...
r10930 Manufacturer='Matt Mackall and others'
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
Adrian Buehlmann
wix updates...
r10930 <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'
CompressionLevel='high' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Condition Message='Mercurial MSI installers require Windows XP or higher'>
VersionNT >= 501
</Condition>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513
<Property Id="INSTALLDIR">
Adrian Buehlmann
wix updates...
r10930 <ComponentSearch Id='SearchForMainExecutableComponent'
Guid='$(var.ComponentMainExecutableGUID)' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Property>
<!--Property Id='ARPCOMMENTS'>any comments</Property-->
FUJIWARA Katsunori
misc: replace domain of mercurial ML address by mercurial-scm.org...
r30888 <Property Id='ARPCONTACT'>mercurial@mercurial-scm.org</Property>
Matt Mackall
urls: bulk-change primary website URLs
r26421 <Property Id='ARPHELPLINK'>https://mercurial-scm.org/wiki/</Property>
<Property Id='ARPURLINFOABOUT'>https://mercurial-scm.org/about/</Property>
<Property Id='ARPURLUPDATEINFO'>https://mercurial-scm.org/downloads/</Property>
<Property Id='ARPHELPTELEPHONE'>https://mercurial-scm.org/wiki/Support</Property>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Property Id='ARPPRODUCTICON'>hgIcon.ico</Property>
<Property Id='INSTALLEDMERCURIALPRODUCTS' Secure='yes'></Property>
<Property Id='REINSTALLMODE'>amus</Property>
Steve Borho
wix: pre-check the 'I approve this license' checkbox...
r10610 <!--Auto-accept the license page-->
<Property Id='LicenseAccepted'>1</Property>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Directory Id='TARGETDIR' Name='SourceDir'>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Directory Id='$(var.PFolder)' Name='PFiles'>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Directory Id='INSTALLDIR' Name='Mercurial'>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Environment Id="Environment" Name="PATH" Part="last" System="yes"
Steve Borho
wix: drop bin/ folder from MSI installers (issue 2673)...
r13563 Permanent="no" Value="[INSTALLDIR]" Action="set" />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Component>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
KeyPath='yes'/>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Component>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf'
KeyPath='yes'/>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Component>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Directory Id='HGRCD' Name='hgrc.d'>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini'
ReadOnly='yes' KeyPath='yes'/>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Component>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'>
Pascal Quantin
win32: fix win32 installers generation...
r23174 <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc'
Adrian Buehlmann
wix updates...
r10930 ReadOnly='yes' KeyPath='yes'/>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Component>
</Directory>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Directory>
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
<RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string'
Value='[INSTALLDIR]' KeyPath='yes' />
Adrian Buehlmann
wix updates...
r10930 <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site'
Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Component>
</Directory>
</Directory>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?if $(var.Platform) = "x86" ?>
<Merge Id='VCRuntime' DiskId='1' Language='1033'
SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
<Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
<?else?>
<Merge Id='VCRuntime' DiskId='1' Language='1033'
SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x64_msm.msm' />
<Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x64_msm.msm' />
<?endif?>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Directory>
Adrian Buehlmann
wix: don't show version in title of root feature...
r10733 <Feature Id='Complete' Title='Mercurial' Description='The complete package'
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
<Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
Level='1' Absent='disallow' >
<ComponentRef Id='MainExecutable' />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <ComponentRef Id='distOutput' />
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
r25409 <ComponentRef Id='libOutput' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <ComponentRef Id='ProgramMenuDir' />
<ComponentRef Id='ReadMe' />
<ComponentRef Id='COPYING' />
<ComponentRef Id='mercurial.rc' />
<ComponentRef Id='mergetools.rc' />
Matt Harbison
wix: add help for current internal topics...
r27684 <ComponentGroupRef Id='helpFolder' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <ComponentGroupRef Id='templatesFolder' />
<MergeRef Id='VCRuntime' />
<MergeRef Id='VCRuntimePolicy' />
</Feature>
<Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
<ComponentGroupRef Id='localeFolder' />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <ComponentRef Id='i18nFolder' />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Feature>
<Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'>
<ComponentGroupRef Id='docFolder' />
</Feature>
<Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'>
<ComponentGroupRef Id='contribFolder' />
</Feature>
</Feature>
<UIRef Id="WixUI_FeatureTree" />
<UIRef Id="WixUI_ErrorProgressText" />
Adrian Buehlmann
contrib/wix: add COPYING.rtf...
r10552 <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" />
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513
<Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />
<Upgrade Id='$(var.ProductUpgradeCode)'>
<UpgradeVersion
IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' OnlyDetect='no'
Property='INSTALLEDMERCURIALPRODUCTS' />
</Upgrade>
<InstallExecuteSequence>
<RemoveExistingProducts After='InstallInitialize'/>
</InstallExecuteSequence>
</Product>
</Wix>