mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 16:55:40 +00:00
527e667296
This makes us use one less tool from MSVC, and removes one more use of wine in cross builds. We replace the call to either rc/llvm-rc or windres with a wrapper script. While the script is not strictly needed for the latter, we use a wrapper in that case anyway because it's one step towards fixing bug 1498414. For llvm-rc, however, we need a wrapper because llvm-rc doesn't preprocess on its own, so the wrapper does that too. The wrapper script also allows to deal with the default flags passed to llvm-rc or windres, rather than inherit them from old-configure. We also need to explicitly pass the codepage to llvm-rc, which was not necessary with rc (presumably, llvm-rc has a different default). While here, remove the unused WINDRES subst from js/src/old-configure.in. Also, while here, we remove --use-temp-file, because as described in the linked bug and in the windres manual page, it was used to work around bugs on Windows 98 and earlier. Differential Revision: https://phabricator.services.mozilla.com/D86312
94 lines
3.0 KiB
Python
94 lines
3.0 KiB
Python
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
from argparse import (
|
|
Action,
|
|
ArgumentParser,
|
|
)
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import tempfile
|
|
|
|
import buildconfig
|
|
|
|
|
|
class CPPFlag(Action):
|
|
all_flags = []
|
|
|
|
def __call__(self, parser, namespace, values, option_string=None):
|
|
if 'windres' in buildconfig.substs['RC'].lower():
|
|
if option_string == '-U':
|
|
return
|
|
if option_string == '-I':
|
|
option_string = '--include-dir'
|
|
|
|
self.all_flags.extend((option_string, values))
|
|
|
|
|
|
def generate_res():
|
|
parser = ArgumentParser()
|
|
parser.add_argument('-D', action=CPPFlag, metavar='VAR[=VAL]', help='Define a variable')
|
|
parser.add_argument('-U', action=CPPFlag, metavar='VAR', help='Undefine a variable')
|
|
parser.add_argument('-I', action=CPPFlag, metavar='DIR', help='Search path for includes')
|
|
parser.add_argument('-o', dest='output', metavar='OUTPUT', help='Output file')
|
|
parser.add_argument('input', help='Input file')
|
|
args = parser.parse_args()
|
|
|
|
is_windres = 'windres' in buildconfig.substs['RC'].lower()
|
|
|
|
verbose = os.environ.get('BUILD_VERBOSE_LOG')
|
|
|
|
# llvm-rc doesn't preprocess on its own, so preprocess manually
|
|
# Theoretically, not windres could be rc.exe, but configure won't use it
|
|
# unless you really ask for it, and it will still work with preprocessed
|
|
# output.
|
|
try:
|
|
if not is_windres:
|
|
fd, path = tempfile.mkstemp(suffix='.rc')
|
|
command = buildconfig.substs['CXXCPP'] + CPPFlag.all_flags
|
|
command.extend(('-DRC_INVOKED', args.input))
|
|
if verbose:
|
|
print('Executing:', ' '.join(command))
|
|
with os.fdopen(fd, 'wb') as fh:
|
|
retcode = subprocess.run(command, stdout=fh).returncode
|
|
if retcode:
|
|
# Rely on the subprocess printing out any relevant error
|
|
return retcode
|
|
else:
|
|
path = args.input
|
|
|
|
command = [buildconfig.substs['RC']]
|
|
if is_windres:
|
|
command.extend(('-O', 'coff'))
|
|
|
|
# Even though llvm-rc doesn't preprocess, we still need to pass at least
|
|
# the -I flags.
|
|
command.extend(CPPFlag.all_flags)
|
|
|
|
if args.output:
|
|
if is_windres:
|
|
command.extend(('-o', args.output))
|
|
else:
|
|
# Use win1252 code page for the input.
|
|
command.extend(('-c', '1252', '-Fo' + args.output))
|
|
|
|
command.append(path)
|
|
|
|
if verbose:
|
|
print('Executing:', ' '.join(command))
|
|
retcode = subprocess.run(command).returncode
|
|
if retcode:
|
|
# Rely on the subprocess printing out any relevant error
|
|
return retcode
|
|
finally:
|
|
if path != args.input:
|
|
os.remove(path)
|
|
|
|
return 0
|
|
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(generate_res())
|