Mercurial > hg
view tests/test-releasenotes-merging.t @ 44763:94f4f2ec7dee stable
packaging: support building Inno installer with PyOxidizer
We want to start distributing Mercurial on Python 3 on
Windows. PyOxidizer will be our vehicle for achieving that.
This commit implements basic support for producing Inno
installers using PyOxidizer.
While it is an eventual goal of PyOxidizer to produce
installers, those features aren't yet implemented. So our
strategy for producing Mercurial installers is similar to
what we've been doing with py2exe: invoke a build system to
produce files then stage those files into a directory so they
can be turned into an installer.
We had to make significant alterations to the pyoxidizer.bzl
config file to get it to produce the files that we desire for
a Windows install. This meant differentiating the build targets
so we can target Windows specifically.
We've added a new module to hgpackaging to deal with interacting
with PyOxidizer. It is similar to pyexe: we invoke a build process
then copy files to a staging directory. Ideally these extra
files would be defined in pyoxidizer.bzl. But I don't think it
is worth doing at this time, as PyOxidizer's config files are
lacking some features to make this turnkey.
The rest of the change is introducing a variant of the
Inno installer code that invokes PyOxidizer instead of
py2exe.
Comparing the Python 2.7 based Inno installers with this
one, the following changes were observed:
* No lib/*.{pyd, dll} files
* No Microsoft.VC90.CRT.manifest
* No msvc{m,p,r}90.dll files
* python27.dll replaced with python37.dll
* Add vcruntime140.dll file
The disappearance of the .pyd and .dll files is acceptable, as
PyOxidizer has embedded these in hg.exe and loads them from
memory.
The disappearance of the *90* files is acceptable because those
provide the Visual C++ 9 runtime, as required by Python 2.7.
Similarly, the appearance of vcruntime140.dll is a requirement
of Python 3.7.
Differential Revision: https://phab.mercurial-scm.org/D8473
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 23 Apr 2020 18:06:02 -0700 |
parents | 3748098d072a |
children |
line wrap: on
line source
#require fuzzywuzzy $ cat >> $HGRCPATH << EOF > [extensions] > releasenotes= > EOF $ hg init simple-repo $ cd simple-repo A fix directive from commit message is added to release notes $ touch fix1 $ hg -q commit -A -l - << EOF > commit 1 > > .. fix:: > > Fix from commit message. > EOF $ cat >> $TESTTMP/single-fix-bullet << EOF > Bug Fixes > ========= > > * Fix from release notes. > EOF $ hg releasenotes -r . $TESTTMP/single-fix-bullet $ cat $TESTTMP/single-fix-bullet Bug Fixes ========= * Fix from release notes. * Fix from commit message. Processing again ignores the already added bullet. $ hg releasenotes -r . $TESTTMP/single-fix-bullet $ cat $TESTTMP/single-fix-bullet Bug Fixes ========= * Fix from release notes. * Fix from commit message. $ cd .. Sections are unioned $ hg init subsections $ cd subsections $ touch fix1 $ hg -q commit -A -l - << EOF > Commit 1 > > .. feature:: Commit Message Feature > > This describes a feature from a commit message. > EOF $ cat >> $TESTTMP/single-feature-section << EOF > New Features > ============ > > Notes Feature > ------------- > > This describes a feature from a release notes file. > EOF $ hg releasenotes -r . $TESTTMP/single-feature-section $ cat $TESTTMP/single-feature-section New Features ============ Notes Feature ------------- This describes a feature from a release notes file. Commit Message Feature ---------------------- This describes a feature from a commit message. Doing it again won't add another section $ hg releasenotes -r . $TESTTMP/single-feature-section Commit Message Feature already exists in feature section; ignoring $ cat $TESTTMP/single-feature-section New Features ============ Notes Feature ------------- This describes a feature from a release notes file. Commit Message Feature ---------------------- This describes a feature from a commit message. $ cd .. Bullets from rev merge with those from notes file. $ hg init bullets $ cd bullets $ touch fix1 $ hg -q commit -A -l - << EOF > commit 1 > > .. fix:: > > this is fix1. > EOF $ touch fix2 $ hg -q commit -A -l - << EOF > commit 2 > > .. fix:: > > this is fix2. > EOF $ hg releasenotes -r 'all()' $TESTTMP/relnotes-bullet-problem $ cat $TESTTMP/relnotes-bullet-problem Bug Fixes ========= * this is fix1. * this is fix2. $ touch fix3 $ hg -q commit -A -l - << EOF > commit 3 > > .. fix:: > > this is fix3. > EOF $ hg releasenotes -r . $TESTTMP/relnotes-bullet-problem $ cat $TESTTMP/relnotes-bullet-problem Bug Fixes ========= * this is fix1. * this is fix2. * this is fix3. $ cd .. Ignores commit messages containing issueNNNN based on issue number. $ hg init simple-fuzzrepo $ cd simple-fuzzrepo $ touch fix1 $ hg -q commit -A -l - << EOF > commit 1 > > .. fix:: > > Resolved issue4567. > EOF $ cat >> $TESTTMP/issue-number-notes << EOF > Bug Fixes > ========= > > * Fixed issue1234 related to XYZ. > > * Fixed issue4567 related to ABC. > > * Fixed issue3986 related to PQR. > EOF $ hg releasenotes -r . $TESTTMP/issue-number-notes "issue4567" already exists in notes; ignoring $ cat $TESTTMP/issue-number-notes Bug Fixes ========= * Fixed issue1234 related to XYZ. * Fixed issue4567 related to ABC. * Fixed issue3986 related to PQR. $ cd .. Adds short commit messages (words < 10) without comparison unless there is an exact match. $ hg init tempdir $ cd tempdir $ touch feature1 $ hg -q commit -A -l - << EOF > commit 1 > > .. feature:: > > Adds a new feature 1. > EOF $ hg releasenotes -r . $TESTTMP/short-sentence-notes $ touch feature2 $ hg -q commit -A -l - << EOF > commit 2 > > .. feature:: > > Adds a new feature 2. > EOF $ hg releasenotes -r . $TESTTMP/short-sentence-notes $ cat $TESTTMP/short-sentence-notes New Features ============ * Adds a new feature 1. * Adds a new feature 2. $ cd .. Ignores commit messages based on fuzzy comparison. $ hg init fuzznotes $ cd fuzznotes $ touch fix1 $ hg -q commit -A -l - << EOF > commit 1 > > .. fix:: > > This is a fix with another line. > And it is a big one. > EOF $ cat >> $TESTTMP/fuzz-ignore-notes << EOF > Bug Fixes > ========= > > * Fixed issue4567 by improving X. > > * This is the first line. This is next line with one newline. > > This is another line written after two newlines. This is going to be a big one. > > * This fixes another problem. > EOF $ hg releasenotes -r . $TESTTMP/fuzz-ignore-notes "This is a fix with another line. And it is a big one." already exists in notes file; ignoring $ cat $TESTTMP/fuzz-ignore-notes Bug Fixes ========= * Fixed issue4567 by improving X. * This is the first line. This is next line with one newline. This is another line written after two newlines. This is going to be a big one. * This fixes another problem.