Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: native_client_sdk/src/build_tools/generate_make.py

Issue 23661005: [NaCl SDK] Add a very simple getting_started example at top-level. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add hello_tutorial.nmf Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/build_tools/build_sdk.py ('k') | native_client_sdk/src/build_tools/parse_dsc.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17fbcc904d596e37df969b74ac701b7aa98114bc..2b402d5699793ee1f1707da7d79adb4a23e29ef7 100644
--- a/native_client_sdk/src/build_tools/generate_make.py
+++ b/native_client_sdk/src/build_tools/generate_make.py
@@ -26,6 +26,11 @@ def IsExample(desc):
def GenerateSourceCopyList(desc):
sources = []
+ # Some examples use their own Makefile/sources/etc.
+ if 'TARGETS' not in desc:
+ # Only copy the DATA files.
+ return desc.get('DATA', [])
+
# Add sources for each target
for target in desc['TARGETS']:
sources.extend(target['SOURCES'])
@@ -196,6 +201,14 @@ def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None,
make_path = os.path.join(out_dir, 'Makefile')
+ outdir = os.path.dirname(os.path.abspath(make_path))
+ if getos.GetPlatform() == 'win':
+ AddMakeBat(pepperdir, outdir)
+
+ # If this project has no TARGETS, then we don't need to generate anything.
+ if 'TARGETS' not in desc:
+ return (name, desc['DEST'])
+
if IsNexe(desc):
template = os.path.join(SDK_RESOURCE_DIR, 'Makefile.example.template')
else:
@@ -219,10 +232,6 @@ def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None,
}
RunTemplateFileIfChanged(template, make_path, template_dict)
- outdir = os.path.dirname(os.path.abspath(make_path))
- if getos.GetPlatform() == 'win':
- AddMakeBat(pepperdir, outdir)
-
if IsExample(desc):
ProcessHTML(srcroot, dstroot, desc, toolchains, configs,
first_toolchain)
« no previous file with comments | « native_client_sdk/src/build_tools/build_sdk.py ('k') | native_client_sdk/src/build_tools/parse_dsc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698