[NaCl SDK] Create a resources/ directory and move files to it.

native_client_sdk/src/build_tools/generate_make.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.
 
 import json
 import os
 import sys
 
 import buildbot_common
 import build_version
 import getos
 from buildbot_common import ErrorExit
 from easy_template import RunTemplateFileIfChanged
-from build_paths import SCRIPT_DIR, SDK_EXAMPLE_DIR
+from build_paths import SDK_RESOURCE_DIR
 
 def Trace(msg):
   if Trace.verbose:
     sys.stderr.write(str(msg) + '\n')
 Trace.verbose = False
 
 
 def IsExample(desc):
   dest = desc['DEST']
   return dest.startswith('examples') or dest.startswith('tests')
@@ skipping 105 matching lines @@
     'title': desc['TITLE'],
     'attrs':
         'data-name="%s" data-tools="%s" data-configs="%s" data-path="%s"' % (
         nmf, ' '.join(tools), ' '.join(configs), path),
   }
   RunTemplateFileIfChanged(srcpath, dstpath, replace)
 
 
 def GenerateManifest(srcroot, dstroot, desc):
   outdir = os.path.join(dstroot, desc['DEST'], desc['NAME'])
-  srcpath = os.path.join(SDK_EXAMPLE_DIR, 'resources', 'manifest.json.template')
+  srcpath = os.path.join(SDK_RESOURCE_DIR, 'manifest.json.template')
   dstpath = os.path.join(outdir, 'manifest.json')
   permissions = desc.get('PERMISSIONS', [])
   socket_permissions = desc.get('SOCKET_PERMISSIONS', [])
   combined_permissions = list(permissions)
   if socket_permissions:
     combined_permissions.append({'socket': socket_permissions})
   pretty_permissions = json.dumps(combined_permissions,
                                   sort_keys=True, indent=4)
   replace = {
       'name': desc['TITLE'],
@@ skipping 24 matching lines @@
 
 
 def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None,
                    first_toolchain=False):
   if not configs:
     configs = ['Debug', 'Release']
 
   name = desc['NAME']
   out_dir = os.path.join(dstroot, desc['DEST'], name)
   buildbot_common.MakeDir(out_dir)
-  srcdirs = desc.get('SEARCH', ['.', '..', '../..'])
-  srcdirs.append(os.path.join(SDK_EXAMPLE_DIR, 'resources'))
+  srcdirs = desc.get('SEARCH', ['.', SDK_RESOURCE_DIR])
 
   # Copy sources to example directory
   sources = GenerateSourceCopyList(desc)
   FindAndCopyFiles(sources, srcroot, srcdirs, out_dir)
 
   # Copy public headers to the include directory.
   for headers_set in desc.get('HEADERS', []):
     headers = headers_set['FILES']
     header_out_dir = os.path.join(dstroot, headers_set['DEST'])
     FindAndCopyFiles(headers, srcroot, srcdirs, header_out_dir)
 
   make_path = os.path.join(out_dir, 'Makefile')
 
   if IsNexe(desc):
-    template = os.path.join(SCRIPT_DIR, 'template.mk')
+    template = os.path.join(SDK_RESOURCE_DIR, 'Makefile.example.template')
   else:
-    template = os.path.join(SCRIPT_DIR, 'library.mk')
+    template = os.path.join(SDK_RESOURCE_DIR, 'Makefile.library.template')
 
   # Ensure the order of |tools| is the same as toolchains; that way if
   # first_toolchain is set, it will choose based on the order of |toolchains|.
   tools = [tool for tool in toolchains if tool in desc['TOOLS']]
   if first_toolchain:
     tools = [tools[0]]
   for target in desc['TARGETS']:
     target.setdefault('CXXFLAGS', [])
     target['CXXFLAGS'].insert(0, '-Wall')
 
@@ skipping 19 matching lines @@
 
 
 def GenerateMasterMakefile(pepperdir, out_path, targets):
   """Generate a Master Makefile that builds all examples.
 
   Args:
     pepperdir: NACL_SDK_ROOT
     out_path: Root for output such that out_path+NAME = full path
     targets: List of targets names
   """
-  in_path = os.path.join(SDK_EXAMPLE_DIR, 'Makefile')
+  in_path = os.path.join(SDK_RESOURCE_DIR, 'Makefile.index.template')
   out_path = os.path.join(out_path, 'Makefile')
   rel_path = os.path.relpath(pepperdir, os.path.dirname(out_path))
   template_dict = {
     'projects': targets,
     'rel_sdk' : rel_path,
   }
   RunTemplateFileIfChanged(in_path, out_path, template_dict)
   outdir = os.path.dirname(os.path.abspath(out_path))
   if getos.GetPlatform() == 'win':
     AddMakeBat(pepperdir, outdir)