Backed out changeset 018e683b25cd (bug 1370007) for breaking tier 2 nightly builds on windows
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 07 Jul 2017 15:23:54 +0200
changeset 409292 173533a310060d0a52d6f6c3b3bee998ab9199d2
parent 409275 a0b5515b13ebfd3220a06fd1cd31f98a9557f031
child 409293 d2f388860d3d74ed8dfa89cf260089a41941c06b
child 409313 da41df2a8b088c81d40542a2d8d996e70690e159
child 409368 e13be3b35c0a8e1e784318642a1e6b785d1e27aa
push id59
push userfmarier@mozilla.com
push dateTue, 11 Jul 2017 23:52:02 +0000
bugs1370007
milestone56.0a1
backs out018e683b25cda1eae9430add87ae3b647c4b3a8d
Backed out changeset 018e683b25cd (bug 1370007) for breaking tier 2 nightly builds on windows
gfx/layers/d3d11/genshaders.py
gfx/layers/moz.build
moz.configure
old mode 100755
new mode 100644
--- a/gfx/layers/d3d11/genshaders.py
+++ b/gfx/layers/d3d11/genshaders.py
@@ -5,17 +5,16 @@ import argparse
 import codecs
 import locale
 import os
 import re
 import subprocess
 import sys
 import tempfile
 import yaml
-import buildconfig
 
 def shell_main():
   parser = argparse.ArgumentParser()
   parser.add_argument('-o', '--output', type=str, required=True,
                       help='Output file')
   parser.add_argument('manifest', type=str,
                       help='Manifest source file')
   args = parser.parse_args()
@@ -66,43 +65,39 @@ def process_manifest(output_fp, manifest
 
   output_fp.write(FOOTER)
   return deps
 
 def run_fxc(shader_model,
             shader_file,
             shader_name,
             output_fp):
-  fxc_location = buildconfig.substs['FXC']
-
   argv = [
-    fxc_location,
+    'fxc',
     '-nologo',
     '-T{0}'.format(shader_model),
     shader_file,
     '-E{0}'.format(shader_name),
     '-Vn{0}'.format(shader_name),
     '-Vi',
   ]
-  if 'Linux' in buildconfig.substs['HOST_OS_ARCH']:
-    argv.insert(0, buildconfig.substs['WINE'])
   if shader_model.startswith('vs_'):
     argv += ['-DVERTEX_SHADER']
   elif shader_model.startswith('ps_'):
     argv += ['-DPIXEL_SHADER']
 
   deps = None
   with ScopedTempFilename() as temp_filename:
     argv += ['-Fh{0}'.format(temp_filename)]
 
     sys.stdout.write('{0}\n'.format(' '.join(argv)))
     proc_stdout = subprocess.check_output(argv)
     proc_stdout = decode_console_text(sys.stdout, proc_stdout)
     deps = find_dependencies(proc_stdout)
-    assert 'fxc2' in fxc_location or len(deps) > 0
+    assert len(deps) > 0
 
     with open(temp_filename, 'r') as temp_fp:
       output_fp.write(temp_fp.read())
 
   output_fp.write("ShaderBytes s{0} = {{ {0}, sizeof({0}) }};\n".format(
     shader_name))
   return deps
 
old mode 100755
new mode 100644
--- a/moz.configure
+++ b/moz.configure
@@ -465,19 +465,16 @@ def nsis_binary_type(nsis):
 @depends(host)
 def nsis_flags(host):
     if host.kernel != 'WINNT':
         return '-nocd'
     return ''
 
 set_config('MAKENSISU_FLAGS', nsis_flags)
 
-fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target)(lambda t: t.kernel == 'WINNT'))
-wine = check_prog('WINE', ['wine'], when=depends(target, host)(lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
-
 # Fallthrough to autoconf-based configure
 include('build/moz.configure/old.configure')
 
 @imports('__sandbox__')
 def all_paths():
     return __sandbox__._all_paths
 
 set_config('ALL_CONFIGURE_PATHS', all_paths())