upstream/mercurial-mirror Files · rust/rhg/src/commands/config.rs

packaging: use PyOxidizer for producing WiX MSI installer...

packaging: use PyOxidizer for producing WiX MSI installer We recently taught our in-tree PyOxidizer configuration file to produce MSI installers with WiX using PyOxidizer's built-in support for doing so. This commit changes our WiX + PyOxidizer installer generation code to use this functionality. After this change, all the Python packaging code is doing is the following: * Building HTML documentation * Making gettext available to the build process. * Munging CLI arguments to variables for the `pyoxidizer` execution. * Invoking `pyoxidizer build`. * Copying the produced `.msi` to the `dist/` directory. Applying this stack on stable and rebuilding the 5.8 MSI installer produced the following differences from the official 5.8 installer: * .exe and .pyd files aren't byte identical (this is expected). * Various .dist-info/ directories have different names due to older versions of PyOxidizer being buggy and not properly normalizing package names. (The new behavior is correct.) * Various *.dist-info/RECORD files are different due to content divergence of files (this is expected). * The python38.dll differs due to newer PyOxidizer shipping a newer version of Python 3.8. * We now ship python3.dll because PyOxidizer now includes this file by default. * The vcruntime140.dll differs because newer PyOxidizer installs a newer version. We also now ship a vcruntime140_1.dll because newer versions of the redistributable ship 2 files now. The WiX GUIDs and IDs of installed files have likely changed as a result of PyOxidizer's different mechanism for generating those identifiers. This means that an upgrade install of the MSI will replace files instead of doing an incremental update. This is likely harmless and we've incurred this kind of breakage before. As far as I can tell, the new PyOxidizer-built MSI is functionally equivalent to the old method. Once we drop support for Python 2.7 MSI installers, we can delete the WiX code from the repository. This commit temporarily drops support for extra `.wxs` files. We raise an exception instead of silently not using them, which I think is appropriate. We should be able to add support back in by injecting state into pyoxidizer.bzl via `--var`. I just didn't want to expend cognitive load to think about the solution as part of this series. Differential Revision: https://phab.mercurial-scm.org/D10688

Simon Sapin - - Load All Authors

File last commit:

r47481:b1e6265e default


                r47981:73f1a103

default

Download file

             config.rs
        
                    38 lines
            
             | 1.1 KiB
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / rhg / src / commands / config.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      use crate::error::CommandError;

      use clap::Arg;

      use format_bytes::format_bytes;

      use hg::errors::HgError;

      use hg::utils::SliceExt;

      pub const HELP_TEXT: &str = "

      With one argument of the form section.name, print just the value of that config item.

      ";

      pub fn args() -> clap::App<'static, 'static> {

          clap::SubCommand::with_name("config")

              .arg(

                  Arg::with_name("name")

                      .help("the section.name to print")

                      .value_name("NAME")

                      .required(true)

                      .takes_value(true),

              )

              .about(HELP_TEXT)

      }

      pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> {

          let (section, name) = invocation

              .subcommand_args

              .value_of("name")

              .expect("missing required CLI argument")

              .as_bytes()

              .split_2(b'.')

              .ok_or_else(|| HgError::unsupported("hg config <section>"))?;

          if let Some(value) = invocation.config.get(section, name) {

              invocation.ui.write_stdout(&format_bytes!(b"{}\n", value))?;

              Ok(())

          } else {

              Err(CommandError::Unsuccessful)

          }

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				use crate::error::CommandError;
				use clap::Arg;
				use format_bytes::format_bytes;
				use hg::errors::HgError;
				use hg::utils::SliceExt;

				pub const HELP_TEXT: &str = "
				With one argument of the form section.name, print just the value of that config item.
				";

				pub fn args() -> clap::App<'static, 'static> {
				clap::SubCommand::with_name("config")
				.arg(
				Arg::with_name("name")
				.help("the section.name to print")
				.value_name("NAME")
				.required(true)
				.takes_value(true),
				)
				.about(HELP_TEXT)
				}

				pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> {
				let (section, name) = invocation
				.subcommand_args
				.value_of("name")
				.expect("missing required CLI argument")
				.as_bytes()
				.split_2(b'.')
				.ok_or_else(\|\| HgError::unsupported("hg config <section>"))?;

				if let Some(value) = invocation.config.get(section, name) {
				invocation.ui.write_stdout(&format_bytes!(b"{}\n", value))?;
				Ok(())
				} else {
				Err(CommandError::Unsuccessful)
				}
				}