##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972
Matt Harbison - - Load All Authors

File last commit:

r47179:e933e661 stable
r49404:c9141848 default
Show More
readme.rst
61 lines | 2.2 KiB | text/x-rst | RstLexer
/ contrib / packaging / inno / readme.rst
History | Annotation | Raw |Copy content |Copy permalink

Requirements

Building the Inno installer requires a Windows machine.

The following system dependencies must be installed:

Building

The packaging.py script automates the process of producing an Inno installer. It manages fetching and configuring the non-system dependencies (such as py2exe, gettext, and various Python packages).

The script requires an activated Visual C++ 2008 command prompt. A shortcut to such a prompt was installed with Microsoft Visual C++ Compiler for Python 2.7. From your Start Menu, look for Microsoft Visual C++ Compiler Package for Python 2.7 then launch either Visual C++ 2008 32-bit Command Prompt or Visual C++ 2008 64-bit Command Prompt.

From the prompt, change to the Mercurial source directory. e.g. cd c:\src\hg.

Next, invoke packaging.py to produce an Inno installer. You will need to supply the path to the Python interpreter to use.:

$ py -3 contrib\packaging\packaging.py \
    inno --python c:\python27\python.exe

Note

The script validates that the Visual C++ environment is active and that the architecture of the specified Python interpreter matches the Visual C++ environment and errors if not.

If everything runs as intended, dependencies will be fetched and configured into the build sub-directory, Mercurial will be built, and an installer placed in the dist sub-directory. The final line of output should print the name of the generated installer.

Additional options may be configured. Run packaging.py inno --help to see a list of program flags.

MinGW

It is theoretically possible to generate an installer that uses MinGW. This isn't well tested and packaging.py and may properly support it. See old versions of this file in version control for potentially useful hints as to how to achieve this.