##// 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:

r41367:763b45bc default
r45274:234882d1 stable
Show More
util.c
222 lines | 4.3 KiB | text/x-c | CLexer
Yuya Nishihara
chg: import frontend sources...
r28060 /*
* Utility functions
*
* Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org>
*
* This software may be used and distributed according to the terms of the
* GNU General Public License version 2 or any later version.
*/
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 #include <errno.h>
Jun Wu
chg: extract the logic of setting FD_CLOEXEC to a utility function...
r28855 #include <fcntl.h>
Yuya Nishihara
chg: import frontend sources...
r28060 #include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
Yuya Nishihara
chg: initialize sigaction fields more reliably...
r28084 #include <string.h>
Jun Wu
chg: show timestamp with debug messages...
r34310 #include <sys/time.h>
Yuya Nishihara
chg: import frontend sources...
r28060 #include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include "util.h"
Jun Wu
chg: use color in debug/error messages conditionally...
r28787 static int colorenabled = 0;
static inline void fsetcolor(FILE *fp, const char *code)
{
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!colorenabled) {
Jun Wu
chg: use color in debug/error messages conditionally...
r28787 return;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: use color in debug/error messages conditionally...
r28787 fprintf(fp, "\033[%sm", code);
}
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 static void vabortmsgerrno(int no, const char *fmt, va_list args)
{
fsetcolor(stderr, "1;31");
fputs("chg: abort: ", stderr);
vfprintf(stderr, fmt, args);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (no != 0) {
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 fprintf(stderr, " (errno = %d, %s)", no, strerror(no));
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 fsetcolor(stderr, "");
fputc('\n', stderr);
exit(255);
}
Yuya Nishihara
chg: import frontend sources...
r28060 void abortmsg(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 vabortmsgerrno(0, fmt, args);
Yuya Nishihara
chg: import frontend sources...
r28060 va_end(args);
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 }
Yuya Nishihara
chg: import frontend sources...
r28060
Jun Wu
chg: add util function abortmsgerrno to print error with errno...
r28788 void abortmsgerrno(const char *fmt, ...)
{
int no = errno;
va_list args;
va_start(args, fmt);
vabortmsgerrno(no, fmt, args);
va_end(args);
Yuya Nishihara
chg: import frontend sources...
r28060 }
static int debugmsgenabled = 0;
Jun Wu
chg: show timestamp with debug messages...
r34310 static double debugstart = 0;
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 static double now()
{
Jun Wu
chg: show timestamp with debug messages...
r34310 struct timeval t;
gettimeofday(&t, NULL);
return t.tv_usec / 1e6 + t.tv_sec;
}
Yuya Nishihara
chg: import frontend sources...
r28060
Jun Wu
chg: use color in debug/error messages conditionally...
r28787 void enablecolor(void)
{
colorenabled = 1;
}
Yuya Nishihara
chg: import frontend sources...
r28060 void enabledebugmsg(void)
{
debugmsgenabled = 1;
Jun Wu
chg: show timestamp with debug messages...
r34310 debugstart = now();
Yuya Nishihara
chg: import frontend sources...
r28060 }
void debugmsg(const char *fmt, ...)
{
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!debugmsgenabled) {
Yuya Nishihara
chg: import frontend sources...
r28060 return;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
va_list args;
va_start(args, fmt);
Jun Wu
chg: use color in debug/error messages conditionally...
r28787 fsetcolor(stderr, "1;30");
Jun Wu
chg: show timestamp with debug messages...
r34310 fprintf(stderr, "chg: debug: %4.6f ", now() - debugstart);
Yuya Nishihara
chg: import frontend sources...
r28060 vfprintf(stderr, fmt, args);
Jun Wu
chg: use color in debug/error messages conditionally...
r28787 fsetcolor(stderr, "");
fputc('\n', stderr);
Yuya Nishihara
chg: import frontend sources...
r28060 va_end(args);
}
Jun Wu
chg: add fchdirx as a utility function...
r28854 void fchdirx(int dirfd)
{
int r = fchdir(dirfd);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (r == -1) {
Jun Wu
chg: add fchdirx as a utility function...
r28854 abortmsgerrno("failed to fchdir");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: add fchdirx as a utility function...
r28854 }
Jun Wu
chg: extract the logic of setting FD_CLOEXEC to a utility function...
r28855 void fsetcloexec(int fd)
{
int flags = fcntl(fd, F_GETFD);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (flags < 0) {
Jun Wu
chg: extract the logic of setting FD_CLOEXEC to a utility function...
r28855 abortmsgerrno("cannot get flags of fd %d", fd);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
Jun Wu
chg: extract the logic of setting FD_CLOEXEC to a utility function...
r28855 abortmsgerrno("cannot set flags of fd %d", fd);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: extract the logic of setting FD_CLOEXEC to a utility function...
r28855 }
Jun Wu
chg: add utility functions mallocx, reallocx...
r28165 void *mallocx(size_t size)
{
void *result = malloc(size);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!result) {
Jun Wu
chg: add utility functions mallocx, reallocx...
r28165 abortmsg("failed to malloc");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: add utility functions mallocx, reallocx...
r28165 return result;
}
void *reallocx(void *ptr, size_t size)
{
void *result = realloc(ptr, size);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!result) {
Jun Wu
chg: add utility functions mallocx, reallocx...
r28165 abortmsg("failed to realloc");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: add utility functions mallocx, reallocx...
r28165 return result;
}
Yuya Nishihara
chg: import frontend sources...
r28060 /*
* Execute a shell command in mostly the same manner as system(), with the
* give environment variables, after chdir to the given cwd. Returns a status
* code compatible with the Python subprocess module.
*/
int runshellcmd(const char *cmd, const char *envp[], const char *cwd)
{
enum { F_SIGINT = 1, F_SIGQUIT = 2, F_SIGMASK = 4, F_WAITPID = 8 };
unsigned int doneflags = 0;
int status = 0;
struct sigaction newsa, oldsaint, oldsaquit;
sigset_t oldmask;
/* block or mask signals just as system() does */
Yuya Nishihara
chg: initialize sigaction fields more reliably...
r28084 memset(&newsa, 0, sizeof(newsa));
Yuya Nishihara
chg: import frontend sources...
r28060 newsa.sa_handler = SIG_IGN;
newsa.sa_flags = 0;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (sigemptyset(&newsa.sa_mask) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (sigaction(SIGINT, &newsa, &oldsaint) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 doneflags |= F_SIGINT;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (sigaction(SIGQUIT, &newsa, &oldsaquit) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 doneflags |= F_SIGQUIT;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (sigaddset(&newsa.sa_mask, SIGCHLD) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (sigprocmask(SIG_BLOCK, &newsa.sa_mask, &oldmask) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 doneflags |= F_SIGMASK;
pid_t pid = fork();
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (pid < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 if (pid == 0) {
sigaction(SIGINT, &oldsaint, NULL);
sigaction(SIGQUIT, &oldsaquit, NULL);
sigprocmask(SIG_SETMASK, &oldmask, NULL);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (cwd && chdir(cwd) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 _exit(127);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 const char *argv[] = {"sh", "-c", cmd, NULL};
if (envp) {
execve("/bin/sh", (char **)argv, (char **)envp);
} else {
execv("/bin/sh", (char **)argv);
}
_exit(127);
} else {
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (waitpid(pid, &status, 0) < 0) {
Yuya Nishihara
chg: import frontend sources...
r28060 goto done;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 doneflags |= F_WAITPID;
}
done:
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (doneflags & F_SIGINT) {
Yuya Nishihara
chg: import frontend sources...
r28060 sigaction(SIGINT, &oldsaint, NULL);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (doneflags & F_SIGQUIT) {
Yuya Nishihara
chg: import frontend sources...
r28060 sigaction(SIGQUIT, &oldsaquit, NULL);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (doneflags & F_SIGMASK) {
Yuya Nishihara
chg: import frontend sources...
r28060 sigprocmask(SIG_SETMASK, &oldmask, NULL);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
/* no way to report other errors, use 127 (= shell termination) */
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!(doneflags & F_WAITPID)) {
Yuya Nishihara
chg: import frontend sources...
r28060 return 127;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (WIFEXITED(status)) {
Yuya Nishihara
chg: import frontend sources...
r28060 return WEXITSTATUS(status);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (WIFSIGNALED(status)) {
Yuya Nishihara
chg: import frontend sources...
r28060 return -WTERMSIG(status);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 return 127;
}