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

Side by Side Diff: site_scons/site_tools/visual_studio_solution.py

Issue 8226: Rollback r4734 to see if it fixes the crashing I experience when starting chr... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « site_scons/site_tools/component_targets_msvs.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python2.4 1 #!/usr/bin/python2.4
2 # Copyright 2008, Google Inc. 2 # Copyright 2008, Google Inc.
3 # All rights reserved. 3 # All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are 6 # modification, are permitted provided that the following conditions are
7 # met: 7 # met:
8 # 8 #
9 # * Redistributions of source code must retain the above copyright 9 # * Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 # Add in the msvs tool. 65 # Add in the msvs tool.
66 env.Tool('msvs') 66 env.Tool('msvs')
67 67
68 # Pick out variants 68 # Pick out variants
69 variants = [e['BUILD_TYPE'] for e in environments] 69 variants = [e['BUILD_TYPE'] for e in environments]
70 # Pick out build targets 70 # Pick out build targets
71 build_targets = [e.subst('$TARGET_ROOT') for e in environments] 71 build_targets = [e.subst('$TARGET_ROOT') for e in environments]
72 # pick out sources, headers, and resources 72 # pick out sources, headers, and resources
73 sources, headers, resources, others = env.GatherInputs( 73 sources, headers, resources, others = env.GatherInputs(
74 [env.Dir('$DESTINATION_ROOT')], 74 [SCons.Script.Dir('$DESTINATION_ROOT')],
75 ['.+\\.(c|cc|m|mm|cpp)$', # source files 75 ['.+\\.(c|cc|m|mm|cpp)$', # source files
76 '.+\\.(h|hh|hpp)$', # header files 76 '.+\\.(h|hh|hpp)$', # header files
77 '.+\\.(rc)$', # resource files 77 '.+\\.(rc)$', # resource files
78 '.*'], # all other files 78 '.*'], # all other files
79 exclude_pattern=exclude_pattern, 79 exclude_pattern=exclude_pattern,
80 ) 80 )
81 # Build main Visual Studio Project file 81 # Build main Visual Studio Project file
82 project_list = env.MSVSProject(target=solution_name + 82 project_list = env.MSVSProject(target=solution_name +
83 env['MSVSPROJECTSUFFIX'], 83 env['MSVSPROJECTSUFFIX'],
84 srcs=sources + headers + others + resources, 84 srcs=sources + headers + others + resources,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 def generate(env): 123 def generate(env):
124 # NOTE: SCons requires the use of this name, which fails gpylint. 124 # NOTE: SCons requires the use of this name, which fails gpylint.
125 """SCons entry point for this tool.""" 125 """SCons entry point for this tool."""
126 126
127 # Add in the gather_inputs tool. 127 # Add in the gather_inputs tool.
128 env.Tool('gather_inputs') 128 env.Tool('gather_inputs')
129 129
130 # Add a method to generate a combined solution file. 130 # Add a method to generate a combined solution file.
131 env.AddMethod(Solution, 'Solution') 131 env.AddMethod(Solution, 'Solution')
OLDNEW
« no previous file with comments | « site_scons/site_tools/component_targets_msvs.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698