Mercurial > hg
view contrib/wix/mercurial.wxs @ 25329:101e84121c13
dispatch: disable demandimport for the --debugger option
Something in Python 2.7.9 or so broke the --debugger option with
ui.debugger = ipdb. I get the traceback below. There is some apparent
confusion with demandimport. This should be disabled anyway for the
--debugger option. The debugger must be imported right away, before
any other dispatch. There's no benefit in delaying the debugger
import.
This patch uses the demandimport.deactivated() context manager.
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 121, in _runcatch
debugmod = __import__(debugger)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 115, in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/ipdb/__init__.py", line 16, in <module>
from ipdb.__main__ import set_trace, post_mortem, pm, run, runcall, runeval, launch_ipdb_on_exception
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 134, in _demandimport
mod = _hgextimport(_origimport, name, globals, locals)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/ipdb/__main__.py", line 29, in <module>
if IPython.__version__ > '0.10.2':
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 106, in __getattribute__
self._load()
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 78, in _load
mod = _hgextimport(_import, head, globals, locals, None, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/IPython/__init__.py", line 45, in <module>
from .config.loader import Config
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 132, in _demandimport
return _origimport(name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/IPython/config/__init__.py", line 16, in <module>
from .application import *
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 115, in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/IPython/config/application.py", line 30, in <module>
from IPython.external.decorator import decorator
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 134, in _demandimport
mod = _hgextimport(_origimport, name, globals, locals)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/IPython/external/decorator/__init__.py", line 2, in <module>
from decorator import *
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 115, in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/decorator.py", line 240, in <module>
'ContextManager', (_GeneratorContextManager,), dict(__call__=__call__))
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Thu, 28 May 2015 16:42:21 -0400 |
parents | 6e38b6fc4123 |
children | 95e042d77a5f |
line wrap: on
line source
<?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. --> <?include guids.wxi ?> <?include defines.wxi ?> <?if $(var.Platform) = "x64" ?> <?define PFolder = ProgramFiles64Folder ?> <?else?> <?define PFolder = ProgramFilesFolder ?> <?endif?> <Product Id='*' Name='Mercurial $(var.Version) ($(var.Platform))' UpgradeCode='$(var.ProductUpgradeCode)' Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others'> <Package Id='*' Keywords='Installer' Description="Mercurial distributed SCM (version $(var.Version))" Comments='$(var.Comments)' Platform='$(var.Platform)' Manufacturer='Matt Mackall and others' InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' /> <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' CompressionLevel='high' /> <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" /> <Condition Message='Mercurial MSI installers require Windows XP or higher'> VersionNT >= 501 </Condition> <Property Id="INSTALLDIR"> <ComponentSearch Id='SearchForMainExecutableComponent' Guid='$(var.ComponentMainExecutableGUID)' /> </Property> <!--Property Id='ARPCOMMENTS'>any comments</Property--> <Property Id='ARPCONTACT'>mercurial@selenic.com</Property> <Property Id='ARPHELPLINK'>http://mercurial.selenic.com/wiki/</Property> <Property Id='ARPURLINFOABOUT'>http://mercurial.selenic.com/about/</Property> <Property Id='ARPURLUPDATEINFO'>http://mercurial.selenic.com/downloads/</Property> <Property Id='ARPHELPTELEPHONE'>http://mercurial.selenic.com/wiki/Support</Property> <Property Id='ARPPRODUCTICON'>hgIcon.ico</Property> <Property Id='INSTALLEDMERCURIALPRODUCTS' Secure='yes'></Property> <Property Id='REINSTALLMODE'>amus</Property> <!--Auto-accept the license page--> <Property Id='LicenseAccepted'>1</Property> <Directory Id='TARGETDIR' Name='SourceDir'> <Directory Id='$(var.PFolder)' Name='PFiles'> <Directory Id='INSTALLDIR' Name='Mercurial'> <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'> <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' /> <Environment Id="Environment" Name="PATH" Part="last" System="yes" Permanent="no" Value="[INSTALLDIR]" Action="set" /> </Component> <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'> <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html' KeyPath='yes'/> </Component> <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'> <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf' KeyPath='yes'/> </Component> <Directory Id='HGRCD' Name='hgrc.d'> <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'> <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini' ReadOnly='yes' KeyPath='yes'/> </Component> <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'> <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' ReadOnly='yes' KeyPath='yes'/> </Component> </Directory> </Directory> </Directory> <Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)"> <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)" Win64='$(var.IsX64)'> <RemoveFolder Id='ProgramMenuDir' On='uninstall' /> <RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string' Value='[INSTALLDIR]' KeyPath='yes' /> <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site' Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' /> </Component> </Directory> </Directory> <?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?> </Directory> <Feature Id='Complete' Title='Mercurial' Description='The complete package' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' Level='1' Absent='disallow' > <ComponentRef Id='MainExecutable' /> <ComponentRef Id='distOutput' /> <ComponentRef Id='ProgramMenuDir' /> <ComponentRef Id='ReadMe' /> <ComponentRef Id='COPYING' /> <ComponentRef Id='mercurial.rc' /> <ComponentRef Id='mergetools.rc' /> <ComponentRef Id='helpFolder' /> <ComponentGroupRef Id='templatesFolder' /> <MergeRef Id='VCRuntime' /> <MergeRef Id='VCRuntimePolicy' /> </Feature> <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'> <ComponentGroupRef Id='localeFolder' /> <ComponentRef Id='i18nFolder' /> </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" /> <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" /> <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>