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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: site_scons/site_tools/component_builders.py

Issue 7242011: Get rid of assumptions about ".nexe" extension. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 6 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 | « SConstruct ('k') | site_scons/site_tools/naclsdk.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: site_scons/site_tools/component_builders.py
===================================================================
--- site_scons/site_tools/component_builders.py (revision 5777)
+++ site_scons/site_tools/component_builders.py (working copy)
@@ -462,6 +462,14 @@
env['PROGRAM_BASENAME'] = prog_name
+ if env['PROGSUFFIX'] and env.subst(prog_name).endswith(env['PROGSUFFIX']):
+ # Temporary hack: If there's already an extension, remove it.
+ # Because PPAPI is revision locked, and expects to be able to use .nexe
+ # TODO: When PPAPI deps is rolled, replace with this:
+ # raise Exception("Program name shouldn't have a suffix")
+ prog_name = env.subst(prog_name)
+ prog_name = prog_name[:-len(env['PROGSUFFIX'])]
+
# Call env.Program()
out_nodes = env.Program(prog_name, *args, **kwargs)
« no previous file with comments | « SConstruct ('k') | site_scons/site_tools/naclsdk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698