Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 799189 - Use mozprocess in cl.py; r=mshal

Browse Source
This commit is contained in:
Gregory Szorc 2013-09-16 12:55:34 -07:00
parent 78b3dbc50a
commit 4c9da56b51
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/cl.py
View File

@ -3,9 +3,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import ctypes
import os, os.path
import subprocess
import os
import sys
from mozprocess.processhandler import ProcessHandlerMixin
from mozbuild.makeutil import Makefile
CL_INCLUDES_PREFIX = os.environ.get("CL_INCLUDES_PREFIX", "Note: including file:")
@ -62,12 +63,12 @@ def InvokeClWithDependencyGeneration(cmdline):
depstarget = os.path.basename(target) + ".pp"
cmdline += ['-showIncludes']
cl = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
mk = Makefile()
rule = mk.create_rule([target])
rule.add_dependencies([normcase(source)])
for line in cl.stdout:
def on_line(line):
# cl -showIncludes prefixes every header with "Note: including file:"
# and an indentation corresponding to the depth (which we don't need)
if line.startswith(CL_INCLUDES_PREFIX):
@ -78,10 +79,20 @@ def InvokeClWithDependencyGeneration(cmdline):
if ' ' not in dep:
rule.add_dependencies([normcase(dep)])
else:
sys.stdout.write(line) # Make sure we preserve the relevant output
# from cl
# Make sure we preserve the relevant output from cl. mozprocess
# swallows the newline delimiter, so we need to re-add it.
sys.stdout.write(line)
sys.stdout.write('\n')
# We need to ignore children because MSVC can fire up a background process
# during compilation. This process is cleaned up on its own. If we kill it,
# we can run into weird compilation issues.
p = ProcessHandlerMixin(cmdline, processOutputLine=[on_line],
ignore_children=True)
p.run()
p.processOutput()
ret = p.wait()
ret = cl.wait()
if ret != 0 or target == "":
sys.exit(ret)

25
js/src/build/cl.py
View File

@ -3,9 +3,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import ctypes
import os, os.path
import subprocess
import os
import sys
from mozprocess.processhandler import ProcessHandlerMixin
from mozbuild.makeutil import Makefile
CL_INCLUDES_PREFIX = os.environ.get("CL_INCLUDES_PREFIX", "Note: including file:")
@ -62,12 +63,12 @@ def InvokeClWithDependencyGeneration(cmdline):
depstarget = os.path.basename(target) + ".pp"
cmdline += ['-showIncludes']
cl = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
mk = Makefile()
rule = mk.create_rule([target])
rule.add_dependencies([normcase(source)])
for line in cl.stdout:
def on_line(line):
# cl -showIncludes prefixes every header with "Note: including file:"
# and an indentation corresponding to the depth (which we don't need)
if line.startswith(CL_INCLUDES_PREFIX):
@ -78,10 +79,20 @@ def InvokeClWithDependencyGeneration(cmdline):
if ' ' not in dep:
rule.add_dependencies([normcase(dep)])
else:
sys.stdout.write(line) # Make sure we preserve the relevant output
# from cl
# Make sure we preserve the relevant output from cl. mozprocess
# swallows the newline delimiter, so we need to re-add it.
sys.stdout.write(line)
sys.stdout.write('\n')
# We need to ignore children because MSVC can fire up a background process
# during compilation. This process is cleaned up on its own. If we kill it,
# we can run into weird compilation issues.
p = ProcessHandlerMixin(cmdline, processOutputLine=[on_line],
ignore_children=True)
p.run()
p.processOutput()
ret = p.wait()
ret = cl.wait()
if ret != 0 or target == "":
sys.exit(ret)