Mercurial > hg
view tests/test-update-dest.t @ 44767:234882d17814 stable
packaging: support building WiX installers with PyOxidizer
We initially implemented PyOxidizer support for Inno installers.
That did most of the heavy work of integrating PyOxidizer into
the packaging system. Implementing WiX installer support was
pretty straightforward.
Aspects of this patch look very similar to Inno's.
The main difference is the handling of the Visual C++
Redistributable Runtime files.
The WiX installer was formerly using merge modules to
install the VC++ 9.0 runtime because this feature is
supported by the WiX installer (it isn't easily available
to Inno installers).
Our strategy for the runtime files is to install the
vcruntime140.dll file next to hg.exe just like any other
file. While we could leverage WiX's functionality for invoking
a VCRedist installer, I don't want to deal with the complexity
at this juncture. So, we let run_pyoxidizer() copy vcruntime140.dll
into the staging directory (like it does for Inno) and our
dynamic WiX XML generator picks it up as a regular file and
installs it.
We did, however, have to teach mercurial.wxs how to conditionally
use the merge modules. But this was rather straightforward.
Comparing the file layout of the WiX installers before and
after:
* Various lib/*.{pyd, dll} files no longer exist
* python27.dll was replaced by python37.dll
* vcruntime140.dll was added
All these changes are expected due to the transition to
Python 3 and to PyOxidizer, which embeded the .pyd and .dll files
in hg.exe.
Differential Revision: https://phab.mercurial-scm.org/D8477
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 20 Apr 2020 17:42:50 -0700 |
parents | eb586ed5d8ce |
children | 8d72e29ad1e0 |
line wrap: on
line source
Test update.requiredest $ cd $TESTTMP $ cat >> $HGRCPATH <<EOF > [commands] > update.requiredest = True > EOF $ hg init repo $ cd repo $ echo a >> a $ hg commit -qAm aa $ hg up abort: you must specify a destination (for example: hg update ".::") [255] $ hg up . 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ HGPLAIN=1 hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg --config commands.update.requiredest=False up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. Check update.requiredest interaction with pull --update $ hg clone repo clone updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd repo $ echo a >> a $ hg commit -qAm aa $ cd ../clone $ hg pull --update abort: update destination required by configuration (use hg pull followed by hg update DEST) [255] $ cd .. update.requiredest should silent the "hg update" text after pull $ hg init repo1 $ cd repo1 $ hg pull ../repo pulling from ../repo requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets 8f0162e483d0:048c2cb95949