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

Unified Diff: site_scons/site_tools/concat_source.py

Issue 8117: Pulling in latest software construction toolkit. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 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 | « site_scons/site_tools/component_builders.py ('k') | site_scons/site_tools/defer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: site_scons/site_tools/concat_source.py
===================================================================
--- site_scons/site_tools/concat_source.py (revision 3849)
+++ site_scons/site_tools/concat_source.py (working copy)
@@ -60,7 +60,7 @@
source_path = str(source_file)
- if 'msvc' in env['TOOLS']:
+ if env.get('CC') == 'cl':
# Add message pragma for nicer progress indication when building with
# MSVC.
output_lines.append('#pragma message("--%s")' % (
@@ -68,11 +68,9 @@
output_lines.append('#include "%s"' % source_path)
- # Need an EOL at the end of the file for more finicky build tools
- output_lines.append('\n')
-
output_file = open(str(target[0]), 'w')
- output_file.write('\n'.join(output_lines))
+ # Need an EOL at the end of the file for more finicky build tools
+ output_file.write('\n'.join(output_lines) + '\n')
output_file.close()
« no previous file with comments | « site_scons/site_tools/component_builders.py ('k') | site_scons/site_tools/defer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698