| Index: native_client_sdk/src/build_tools/generate_make.py
|
| diff --git a/native_client_sdk/src/build_tools/generate_make.py b/native_client_sdk/src/build_tools/generate_make.py
|
| index 45eb9336f89f08c442e3ae5eae4ceedeb76d6758..830091ee479a28de4da0d9a1c456c631bac55c24 100644
|
| --- a/native_client_sdk/src/build_tools/generate_make.py
|
| +++ b/native_client_sdk/src/build_tools/generate_make.py
|
| @@ -165,8 +165,8 @@ def GenerateManifest(srcroot, dstroot, desc):
|
| RunTemplateFileIfChanged(srcpath, dstpath, replace)
|
|
|
|
|
| -def FindAndCopyFiles(src_files, root, search_dirs, dst_dir):
|
| - buildbot_common.MakeDir(dst_dir)
|
| +def FindAndCopyFiles(src_files, root, search_dirs, dst_dir, verbose=True):
|
| + buildbot_common.MakeDir(dst_dir, verbose=verbose)
|
| for src_name in src_files:
|
| src_file = FindFile(src_name, root, search_dirs)
|
| if not src_file:
|
| @@ -179,8 +179,8 @@ def FindAndCopyFiles(src_files, root, search_dirs, dst_dir):
|
| continue
|
| dst_path = os.path.dirname(dst_file)
|
| if not os.path.exists(dst_path):
|
| - buildbot_common.MakeDir(dst_path)
|
| - buildbot_common.CopyFile(src_file, dst_file)
|
| + buildbot_common.MakeDir(dst_path, verbose=verbose)
|
| + buildbot_common.CopyFile(src_file, dst_file, verbose=verbose)
|
|
|
|
|
| def ModifyDescInPlace(desc):
|
| @@ -213,24 +213,24 @@ def ModifyDescInPlace(desc):
|
|
|
|
|
| def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None,
|
| - first_toolchain=False):
|
| + first_toolchain=False, verbose=True):
|
| if not configs:
|
| configs = ['Debug', 'Release']
|
|
|
| name = desc['NAME']
|
| out_dir = os.path.join(dstroot, desc['DEST'], name)
|
| - buildbot_common.MakeDir(out_dir)
|
| + buildbot_common.MakeDir(out_dir, verbose=verbose)
|
| srcdirs = desc.get('SEARCH', ['.', SDK_RESOURCE_DIR])
|
|
|
| # Copy sources to example directory
|
| sources = GenerateSourceCopyList(desc)
|
| - FindAndCopyFiles(sources, srcroot, srcdirs, out_dir)
|
| + FindAndCopyFiles(sources, srcroot, srcdirs, out_dir, verbose=verbose)
|
|
|
| # 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)
|
| + FindAndCopyFiles(headers, srcroot, srcdirs, header_out_dir, verbose=verbose)
|
|
|
| make_path = os.path.join(out_dir, 'Makefile')
|
|
|
|
|