Add Linux Host builds to NaCl SDK

native_client_sdk/src/build_tools/make_rules.py

 #!/usr/bin/env python
 # 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.
 
 import os
 
 
 #
 # Default macros for various platforms.
@@ skipping 91 matching lines @@
 PEXE_LINK_RULES = {
   'Debug': '<TAB>$(<LINK>) -o $@ $^ -g $(<TC>_LDFLAGS) $(<PROJ>_LDFLAGS) -L$(NACL_SDK_ROOT)/lib/$(OSNAME)_<ARCH>_<tc>/<config> <LIBLIST>\n' + PEXE_TRANSLATE_RULE,
   'Release': '<TAB>$(<LINK>) -o $@ $^ $(<TC>_LDFLAGS) $(<PROJ>_LDFLAGS) -L$(NACL_SDK_ROOT)/lib/$(OSNAME)_<ARCH>_<tc>/<config> <LIBLIST>\n' + PEXE_TRANSLATE_RULE,
 }
 
 WIN_LINK_RULES = {
   'Debug': '<TAB>$(<LINK>) /DLL /OUT:$@ /PDG:$@.pdb /Zi $(<PROJ>_LDFLAGS) /DEBUG /LIBPATH:$(NACL_SDK_ROOT)/lib/win_x86_32_host/Debug $^ <LIBLIST> $(WIN_LDFLAGS)',
   'Release': '<TAB>$(<LINK>) /DLL /OUT:$@ $(<PROJ>_LDFLAGS) /LIBPATH:$(NACL_SDK_ROOT)/lib/win_x86_32_host/Release $^ <LIBLIST> $(WIN_LDFLAGS)'
 }
 
-WIN_LAUNCH_RULES = """
-HOST_ARGS:=--register-pepper-plugins=$(abspath win/<proj>.dll);application/x-nacl
-LAUNCH_HOST: CHECK_FOR_CHROME all
-<TAB>$(CHROME_PATH) $(HOST_ARGS) "localhost:5103/index_win.html"
-"""
 
 #
 # Lib rules for various platforms.
 #
 POSIX_LIB_RULES = {
   'Debug':
       '<TAB>$(MKDIR) -p $(dir $@)\n'
       '<TAB>$(<LIB>) $@ $^',
   'Release':
       '<TAB>$(MKDIR) -p $(dir $@)\n'
@@ skipping 36 matching lines @@
   'MAIN': '<tc>/<config>/<proj>.dll',
   'NMFMAIN': '<tc>/<config>/<proj>.dll',
   'SO': None,
   'LIB': '$(NACL_SDK_ROOT)/lib/win_<ARCH>_host/<config>/<proj>.lib',
 }
 
 LINUX_TOOL = {
   'DEFINE': '-D%s',
   'INCLUDE': '-I%s',
   'LIBRARY': '-l%s',
-  'MAIN': '<tc>/<config>/lib<proj>_<ARCH>.so',
-  'NMFMAIN': '<tc>/<config>/lib<proj>_<ARCH>.so',
-  'SO': '<tc>/<config>/lib<proj>_<ARCH>.so',
+  'MAIN': '<tc>/<config>/lib<proj>.so',
+  'NMFMAIN': '<tc>/<config>/lib<proj>.so',
+  'SO': '<tc>/<config>/lib<proj>.so',
   'LIB': '$(NACL_SDK_ROOT)/lib/linux_<ARCH>_host/<config>/lib<proj>.a',
 }
 
 NACL_TOOL = {
   'DEFINE': '-D%s',
   'INCLUDE': '-I%s',
   'LIBRARY': '-l%s',
   'MAIN': '<tc>/<config>/<proj>_<ARCH>.nexe',
   'NMFMAIN': '<tc>/<config>/<proj>_<ARCH>.nexe',
   'SO': '<tc>/<config>/<proj>_<ARCH>.so',
@@ skipping 10 matching lines @@
       '<tc>/<config>/<proj>_x86_64.nexe '
       '<tc>/<config>/<proj>_arm.nexe',
   'SO': None,
   'LIB': '$(NACL_SDK_ROOT)/lib/$(OSNAME)_<ARCH>_<tc>/<config>/lib<proj>.a',
 }
 
 
 #
 # Various Architectures
 #
-LINUX_32 = {
-  '<arch>': '32',
-  '<ARCH>': 'x86_32',
-  '<MACH>': '-m32',
-}
-LINUX_64 = {
-  '<arch>': '64',
-  '<ARCH>': 'x86_64',
-  '<MACH>': '-m64',
+LINUX = {
+  '<arch>': '',
+  '<ARCH>': '',
+  '<MACH>': '',
 }
 NACL_X86_32 = {
   '<arch>': '32',
   '<ARCH>': 'x86_32',
   '<MACH>': '-m32',
 }
 NACL_X86_64 = {
   '<arch>': '64',
   '<ARCH>': 'x86_64',
   '<MACH>': '-m64',
@@ skipping 49 matching lines @@
     'DEFS': WIN_DEFAULTS,
     'CC': WIN_CC_RULES,
     'CXX': WIN_CC_RULES,
     'NMF' : NMF_EMPTY,
     'MAIN': WIN_LINK_RULES,
     'LIB': WIN_LIB_RULES,
     'SO': None,
     'TOOL': WIN_TOOL
   },
   'linux' : {
-    'ARCHES': [LINUX_32, LINUX_64],
+    'ARCHES': [LINUX],
     'DEFS': LINUX_DEFAULTS,
     'CC': SO_CC_RULES,
     'CXX': SO_CC_RULES,
     'NMF' : NMF_EMPTY,
     'MAIN': SO_LINK_RULES,
     'LIB': POSIX_LIB_RULES,
     'SO': None,
     'TOOL': LINUX_TOOL
   }
 }
@@ skipping 65 matching lines @@
         self.tc, self.cfg, self.arch['<ARCH>'], self.project.upper())
     return '%s:=%s\n' % (obj_list, sub_str)
 
   def GetArches(self):
     return BUILD_RULES[self.tc]['ARCHES']
 
   def GetObjectList(self):
     return '%s_%s_%s_%s_O' % (self.project.upper(), self.tc.upper(),
                               self.cfg.upper(), self.arch['<ARCH>'])
 
+  def GetPepperPlugin(self):
+    plugin = self.Replace(BUILD_RULES[self.tc]['TOOL']['MAIN'])
+    text  ='PPAPI_<CONFIG>:=$(abspath %s)' % plugin

[binji, 2012/08/16 00:17:52]

nit: remove extra space before =, add space after

[noelallen1, 2012/08/16 17:58:30]

Done.

+    text +=';application/x-ppapi-%s\n' % self.vars['<config>'].lower()

[binji, 2012/08/16 00:17:52]

nit: add space after += 

[noelallen1, 2012/08/16 17:58:30]

Done.

+    return self.Replace(text)
+
+
   def SetArch(self, arch):
     self.arch = arch
     for key in arch:
       self.vars[key] = arch[key]
 
   def SetConfig(self, config):
     self.cfg = config
     self.vars['<config>'] = config
     self.vars['<CONFIG>'] = config.upper()
 
@@ skipping 99 matching lines @@
     }
     for dll in dlls:
       replace['<proj>'] = dll
       nmf_targets.append(Replace(dll_target, replace))
     replace['<proj>'] = main
     nmf_targets.append(Replace(target, replace))
 
   replace['<NMF_TARGETS>'] = ' '.join(nmf_targets)
   rules = Replace(BUILD_RULES[tc]['NMF'], replace)
   return '\nALL_TARGETS+=%s/%s/%s.nmf' % (tc, cfg, main) + rules + '\n'