upstream/mercurial-mirror Files · contrib/fuzz/fuzzutil.h

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

Augie Fackler - - Load All Authors

File last commit:

r44013:6f5c352f default


                r45260:c9517d9d

default

Download file

             fuzzutil.h
        
                    37 lines
            
             | 1002 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / fuzz / fuzzutil.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fuzz: extract some common utilities and use modern C++ idioms...

              r38191
            
      #ifndef CONTRIB_FUZZ_FUZZUTIL_H

      #define CONTRIB_FUZZ_FUZZUTIL_H

      #include <iostream>

      #include <memory>

        Augie Fackler
    
fuzzutil: make it possible to use absl when C++17 isn't supported...

              r38192
            
      #include <stdint.h>

      /* Try and use std::optional, but failing that assume we'll have a

       * workable https://abseil.io/ install on the include path to get

       * their backport of std::optional. */

      #ifdef __has_include

      #if __has_include(<optional>) && __cplusplus >= 201703L

        Augie Fackler
    
fuzz: extract some common utilities and use modern C++ idioms...

              r38191
            
      #include <optional>

        Augie Fackler
    
fuzzutil: make it possible to use absl when C++17 isn't supported...

              r38192
            
      #define CONTRIB_FUZZ_HAVE_STD_OPTIONAL

      #endif

      #endif

      #ifdef CONTRIB_FUZZ_HAVE_STD_OPTIONAL

      namespace contrib

      {

      using std::nullopt;

      using std::optional;

      } /* namespace contrib */

      #else

      #include "third_party/absl/types/optional.h"

      namespace contrib

      {

      using absl::nullopt;

      using absl::optional;

      } /* namespace contrib */

      #endif

        Augie Fackler
    
fuzz: extract some common utilities and use modern C++ idioms...

              r38191
            
      /* set DEBUG to 1 for a few debugging prints, or 2 for a lot */

      #define DEBUG 0

      #define LOG(level)                                                             \

      	if (level <= DEBUG)                                                    \

      	std::cout

      #endif /* CONTRIB_FUZZ_FUZZUTIL_H */

	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

Augie Fackler fuzz: extract some common utilities and use modern C++ idioms...	r38191	#ifndef CONTRIB_FUZZ_FUZZUTIL_H
		#define CONTRIB_FUZZ_FUZZUTIL_H
		#include <iostream>
		#include <memory>
Augie Fackler fuzzutil: make it possible to use absl when C++17 isn't supported...	r38192	#include <stdint.h>

		/* Try and use std::optional, but failing that assume we'll have a
		* workable https://abseil.io/ install on the include path to get
		* their backport of std::optional. */
		#ifdef __has_include
		#if __has_include(<optional>) && __cplusplus >= 201703L
Augie Fackler fuzz: extract some common utilities and use modern C++ idioms...	r38191	#include <optional>
Augie Fackler fuzzutil: make it possible to use absl when C++17 isn't supported...	r38192	#define CONTRIB_FUZZ_HAVE_STD_OPTIONAL
		#endif
		#endif
		#ifdef CONTRIB_FUZZ_HAVE_STD_OPTIONAL
		namespace contrib
		{
		using std::nullopt;
		using std::optional;
		} /* namespace contrib */
		#else
		#include "third_party/absl/types/optional.h"
		namespace contrib
		{
		using absl::nullopt;
		using absl::optional;
		} /* namespace contrib */
		#endif
Augie Fackler fuzz: extract some common utilities and use modern C++ idioms...	r38191
		/* set DEBUG to 1 for a few debugging prints, or 2 for a lot */
		#define DEBUG 0
		#define LOG(level) \
		if (level <= DEBUG) \
		std::cout

		#endif /* CONTRIB_FUZZ_FUZZUTIL_H */