##// END OF EJS Templates
packaging: support building WiX installers with PyOxidizer...
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

File last commit:

r45090:d31d1c06 default
r45260:c9517d9d default
Show More
Cargo.toml
32 lines | 787 B | application/toml | TOMLLexer
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 [package]
name = "hg-cpython"
version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"]
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 edition = "2018"
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
[lib]
name='rusthg'
crate-type = ["cdylib"]
[features]
Georges Racinet
rust-cpython: build and support for Python3...
r41021 default = ["python27"]
Raphaël Gomès
rust-re2: add wrapper for calling Re2 from Rust...
r44786 with-re2 = ["hg-core/with-re2"]
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
Yuya Nishihara
rust-cpython: prepare for writing tests that require libpython...
r43583 # Features to build an extension module:
Yuya Nishihara
rust-cpython: drop direct dependency on python(27|3)_sys...
r43485 python27 = ["cpython/python27-sys", "cpython/extension-module-2-7"]
Yuya Nishihara
rust-cpython: prepare for writing tests that require libpython...
r43583 python3 = ["cpython/python3-sys", "cpython/extension-module"]
Georges Racinet
rust-cpython: build and support for Python3...
r41021
Yuya Nishihara
rust-cpython: prepare for writing tests that require libpython...
r43583 # Enable one of these features to build a test executable linked to libpython:
# e.g. cargo test --no-default-features --features python27-bin
python27-bin = ["cpython/python27-sys"]
python3-bin = ["cpython/python3-sys"]
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
[dependencies]
Raphaël Gomès
rust-re2: add wrapper for calling Re2 from Rust...
r44786 hg-core = { path = "../hg-core"}
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 libc = '*'
Raphaël Gomès
rust-status: add trace-level logging for Rust status fallback for debugging...
r45062 log = "0.4.8"
Raphaël Gomès
rust: add logging utils...
r45027 simple_logger = "1.6.0"
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
[dependencies.cpython]
Raphaël Gomès
rust: update all dependencies...
r45090 version = "0.4.1"
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 default-features = false