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

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

Issue 13488007: [NaCl SDK] Make the SDK examples buildable as a packaged app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix license headers Created 7 years, 8 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_app.py ('k') | native_client_sdk/src/build_tools/generate_index.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/build_utils.py
diff --git a/native_client_sdk/src/build_tools/build_utils.py b/native_client_sdk/src/build_tools/build_utils.py
index 83df0300578bf7ef0ec328f880d070c7d5dd7c1f..ffe8cf0d38800eef260a442c4de590a93f59371c 100644
--- a/native_client_sdk/src/build_tools/build_utils.py
+++ b/native_client_sdk/src/build_tools/build_utils.py
@@ -31,8 +31,18 @@ def ChromeVersion():
if info.url.startswith('/trunk/'):
return 'trunk.%s' % info.revision
else:
- exec(open(VERSION_PATH).read())
- return '%s.%s.%s.%s' % (MAJOR, MINOR, BUILD, PATCH)
+ return ChromeVersionNoTrunk()
+
+
+def ChromeVersionNoTrunk():
+ '''Extract the chrome version from src/chrome/VERSION.
+ Ignore whether this is a trunk build.
+
+ Returns:
+ Chrome version string.
+ '''
+ exec(open(VERSION_PATH).read())
+ return '%s.%s.%s.%s' % (MAJOR, MINOR, BUILD, PATCH)
def ChromeMajorVersion():
« no previous file with comments | « native_client_sdk/src/build_tools/build_app.py ('k') | native_client_sdk/src/build_tools/generate_index.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698