mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
199899047a
Recently, [@]froydnj had some trouble with `mach`, and after half an hour of struggle, a simple `git clean` and `git reset --hard` seemed to fix the issue. Apparently, sometimes (though I'm not sure when, and I don't even have a convincing argument), the changes to `mach` scripts don't really seem to reflect on the related bytecode files (when it absolutely should've!). Having bytecode files is just a matter of optimization (i.e., we don't have to compile the scripts again), but when it comes to our simple build system, "not having them" doesn't add a great overhead. So, we could just disable their creation to avoid such issues in the future. Existing users can do `find ./python -name '*.pyc' -delete` for a cleanup (and maybe remove the `python/_virtualenv` directory too, though not necessary) Source-Repo: https://github.com/servo/servo Source-Revision: ca3cd64d6b1999292d634bfa237c2705e6d575c1 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f14d2e622061e164ccc9f02b60a226c41d881629
94 lines
3.8 KiB
Bash
Executable File
94 lines
3.8 KiB
Bash
Executable File
#!/bin/sh
|
|
# 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/.
|
|
|
|
# The beginning of this script is both valid shell and valid python,
|
|
# such that the script starts with the shell and is reexecuted with
|
|
# the right python.
|
|
''':' && if [ ! -z "$MSYSTEM" ] ; then exec python "$0" "$@" ; else which python2.7 > /dev/null 2> /dev/null && exec python2.7 "$0" "$@" || exec python "$0" "$@" ; fi
|
|
'''
|
|
|
|
from __future__ import print_function, unicode_literals
|
|
|
|
|
|
import os
|
|
import sys
|
|
|
|
|
|
def main(args):
|
|
topdir = os.path.abspath(os.path.dirname(sys.argv[0]))
|
|
sys.path.insert(0, os.path.join(topdir, "python"))
|
|
import mach_bootstrap
|
|
mach = mach_bootstrap.bootstrap(topdir)
|
|
sys.exit(mach.run(sys.argv[1:]))
|
|
|
|
|
|
if __name__ == '__main__':
|
|
sys.dont_write_bytecode = True
|
|
if sys.platform == 'win32':
|
|
# This is a complete hack to work around the fact that Windows
|
|
# multiprocessing needs to import the original module (ie: this
|
|
# file), but only works if it has a .py extension.
|
|
#
|
|
# We do this by a sort of two-level function interposing. The first
|
|
# level interposes forking.get_command_line() with our version defined
|
|
# in my_get_command_line(). Our version of get_command_line will
|
|
# replace the command string with the contents of the fork_interpose()
|
|
# function to be used in the subprocess.
|
|
#
|
|
# The subprocess then gets an interposed imp.find_module(), which we
|
|
# hack up to find 'mach' without the .py extension, since we already
|
|
# know where it is (it's us!). If we're not looking for 'mach', then
|
|
# the original find_module will suffice.
|
|
#
|
|
# See also: http://bugs.python.org/issue19946
|
|
# And: https://bugzilla.mozilla.org/show_bug.cgi?id=914563
|
|
import inspect
|
|
from multiprocessing import forking
|
|
global orig_command_line
|
|
|
|
def fork_interpose():
|
|
import imp
|
|
import os
|
|
import sys
|
|
orig_find_module = imp.find_module
|
|
def my_find_module(name, dirs):
|
|
if name == 'mach':
|
|
path = os.path.join(dirs[0], 'mach')
|
|
f = open(path)
|
|
return (f, path, ('', 'r', imp.PY_SOURCE))
|
|
return orig_find_module(name, dirs)
|
|
|
|
# Don't allow writing bytecode file for mach module.
|
|
orig_load_module = imp.load_module
|
|
def my_load_module(name, file, path, description):
|
|
# multiprocess.forking invokes imp.load_module manually and
|
|
# hard-codes the name __parents_main__ as the module name.
|
|
if name == '__parents_main__':
|
|
old_bytecode = sys.dont_write_bytecode
|
|
sys.dont_write_bytecode = True
|
|
try:
|
|
return orig_load_module(name, file, path, description)
|
|
finally:
|
|
sys.dont_write_bytecode = old_bytecode
|
|
|
|
return orig_load_module(name, file, path, description)
|
|
|
|
imp.find_module = my_find_module
|
|
imp.load_module = my_load_module
|
|
from multiprocessing.forking import main; main()
|
|
|
|
def my_get_command_line():
|
|
fork_code, lineno = inspect.getsourcelines(fork_interpose)
|
|
# Remove the first line (for 'def fork_interpose():') and the three
|
|
# levels of indentation (12 spaces).
|
|
fork_string = ''.join(x[12:] for x in fork_code[1:])
|
|
cmdline = orig_command_line()
|
|
cmdline[2] = fork_string
|
|
return cmdline
|
|
orig_command_line = forking.get_command_line
|
|
forking.get_command_line = my_get_command_line
|
|
|
|
main(sys.argv)
|