hook up new rc prototype

build/toolchain/win/tool_wrapper.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility functions for Windows builds.
 
 This file is copied to the build directory as part of toolchain setup and
 is used to set up calls to tools used by the build that need wrappers.
 """
 
+import codecs
+import filecmp
 import os
 import re
 import shutil
 import subprocess
 import stat
 import string
 import sys
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ skipping 263 matching lines @@
           not line.startswith('Microsoft (R) Macro Assembler') and
           not line.startswith(' Assembling: ') and
           line):
         print line
     return popen.returncode
 
   def ExecRcWrapper(self, arch, *args):
     """Filter logo banner from invocations of rc.exe. Older versions of RC
     don't support the /nologo flag."""
     env = self._GetEnv(arch)
+    #print args
     popen = subprocess.Popen(args, shell=True, env=env,
                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     out, _ = popen.communicate()
     for line in out.splitlines():
       if (not line.startswith('Microsoft (R) Windows (R) Resource Compiler') and
           not line.startswith('Copy' + 'right (C' +
                               ') Microsoft Corporation') and
           line):
         print line
-    return popen.returncode
+    final_result = popen.returncode
+
+    ppargs = ['c:\\src\\hack\\res\pptest.exe']
+    ppargs += [a for a in args if a.startswith('-I') or a.startswith('-D')]
+    rcfile = args[-1]  # FIXME assumes .rc file is last
+
+    # convert utf-16 to ascii if needed
+    rcfiledata = open(rcfile, 'rb').read()
+    rcfile = rcfile + '%d.utf8.rc' % os.getpid()  # if one rc is used twice
+    wrote_utf8 = False
+    if rcfiledata.startswith(codecs.BOM_UTF16_LE):
+      try:
+        rcfiledata = rcfiledata[2:].decode('utf-16le').encode('utf-8')
+        wrote_utf8 = True
+      except e:
+        print >> sys.stderr, e
+    with open(rcfile, 'wb') as f:
+      f.write(rcfiledata)
+
+    ppargs.append(rcfile)
+
+    ppargs += ['|', 'c:\\src\\hack\\res\\rc.exe']
+    # Make sure rc-relative resources can be found:
+    ppargs.append("/cd" + os.path.dirname(rcfile))
+    resflag = args[-2]  # FIXME assumes .res file is 2nd-to-last
+    assert resflag.startswith('/fo')
+    resfile = resflag[3:]
+    resfile2 = resfile + '2'
+    resflag = '/fo' + os.path.abspath(resfile2)
+    ppargs.append(resflag)
+    if wrote_utf8:
+      ppargs.append('/utf-8')
+    #print 'asdfasdfa', ppargs
+    # MS rc.exe searches for files referenced from .rc files relative to -I
+    # flags in addition to the pwd, so -I flags need to be passed both to
+    # pptest and rc :-/
+    ppargs += [a for a in args if a.startswith('-I')]
+    subprocess.check_call(ppargs, shell=True, env=env)
+    assert filecmp.cmp(resfile, resfile2)
+
+    return final_result
 
   def ExecActionWrapper(self, arch, rspfile, *dirname):
     """Runs an action command line from a response file using the environment
     for |arch|. If |dirname| is supplied, use that as the working directory."""
     env = self._GetEnv(arch)
     # TODO(scottmg): This is a temporary hack to get some specific variables
     # through to actions that are set after GN-time. http://crbug.com/333738.
     for k, v in os.environ.iteritems():
       if k not in env:
         env[k] = v
     args = open(rspfile).read()
     dirname = dirname[0] if dirname else None
     return subprocess.call(args, shell=True, env=env, cwd=dirname)
 
   def ExecClCompile(self, project_dir, selected_files):
     """Executed by msvs-ninja projects when the 'ClCompile' target is used to
     build selected C/C++ files."""
     project_dir = os.path.relpath(project_dir, BASE_DIR)
     selected_files = selected_files.split(';')
     ninja_targets = [os.path.join(project_dir, filename) + '^^'
         for filename in selected_files]
     cmd = ['ninja.exe']
     cmd.extend(ninja_targets)
     return subprocess.call(cmd, shell=True, cwd=BASE_DIR)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))