diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 16:43:50 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 16:43:50 +0000 |
| commit | b1e75f52fbac55e600415cd428dc40a6a68fe90b (patch) | |
| tree | 15097d97360c4081464c0fd00623d025d57ef7b5 | |
| parent | 5a43397bd2e2fdceecf359a8430db0983fd3dba8 (diff) | |
| download | chromium_src-b1e75f52fbac55e600415cd428dc40a6a68fe90b.zip chromium_src-b1e75f52fbac55e600415cd428dc40a6a68fe90b.tar.gz chromium_src-b1e75f52fbac55e600415cd428dc40a6a68fe90b.tar.bz2 | |
Rollback r4734 to see if it fixes the crashing I experience when starting chrome, as well as the 1MB regression in chrome.dll size.
Review URL: http://codereview.chromium.org/8226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4781 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/SConscript.main | 21 | ||||
| -rwxr-xr-x | site_scons/site_tools/component_targets_msvs.py | 9 | ||||
| -rw-r--r-- | site_scons/site_tools/visual_studio_solution.py | 2 |
3 files changed, 5 insertions, 27 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 5618396..8e10aab 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -237,7 +237,6 @@ windows_env = root_env.Clone() environment_list.append(windows_env) windows_env.Tool('target_platform_windows') windows_env.Tool('target_debug') -windows_env.Tool('component_targets_msvs') # Per target project support. windows_env.Tool('midl') windows_env.Replace( BUILD_TYPE = 'debug-windows', @@ -655,25 +654,11 @@ BuildComponents(environment_list) # will be populated. if root_env.Bit('solution'): solution_env = root_env.Clone(tools = ['visual_studio_solution']) - src_solution = solution_env.Solution( - '$MAIN_DIR/chrome_scons_src', [windows_env], + solution = solution_env.Solution( + '$MAIN_DIR/chrome_scons', [windows_env], exclude_pattern = '.*(Program Files|platformsdk_vista_6_0|cygwin).*', ) - - solution = windows_env.ComponentVSSolution('chrome_scons', - [ - 'all_libraries', - 'all_programs', - 'all_test_programs', - ], - projects = [windows_env.File('$MAIN_DIR/chrome_scons_src.vcproj')], - COMPONENT_VS_SOLUTION_DIR='$MAIN_DIR', - COMPONENT_VS_PROJECT_DIR='$MAIN_DIR/projects', - COMPONENT_VS_PROJECT_SCRIPT_PATH=( - 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), - ) - Default(None) # Delete all other default targets. - Default([src_solution, solution]) # Build just the solution. + Default(solution) # Build just the solution. # ------------------------------------------------------------------------- diff --git a/site_scons/site_tools/component_targets_msvs.py b/site_scons/site_tools/component_targets_msvs.py index e86de89..57be5b3 100755 --- a/site_scons/site_tools/component_targets_msvs.py +++ b/site_scons/site_tools/component_targets_msvs.py @@ -105,9 +105,7 @@ def ComponentVSProjectBuilder(target, source, env): project_file = target[0].path project_to_main = env.RelativePath(target[0].dir, env.Dir('$MAIN_DIR'), sep='/') - - env_hammer_bat = env.Clone(VS_PROJECT_TO_MAIN_DIR=project_to_main) - hammer_bat = env_hammer_bat.subst('$COMPONENT_VS_PROJECT_SCRIPT_PATH', raw=1) + hammer_bat = '$(ProjectDir)/%s/hammer.bat' % project_to_main # Project header xml_impl = xml.dom.getDOMImplementation() @@ -435,10 +433,6 @@ def generate(env): COMPONENT_VS_PROJECT_DIR='$COMPONENT_VS_SOLUTION_DIR/projects', COMPONENT_VS_SOLUTION_SUFFIX='.sln', COMPONENT_VS_PROJECT_SUFFIX='.vcproj', - COMPONENT_VS_PROJECT_SCRIPT_NAME = 'hammer.bat', - COMPONENT_VS_PROJECT_SCRIPT_PATH = ( - '$$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR/' - '$COMPONENT_VS_PROJECT_SCRIPT_NAME'), ) AddTargetGroup('all_solutions', 'solutions can be built') @@ -447,7 +441,6 @@ def generate(env): vcprojaction = SCons.Script.Action(ComponentVSProjectBuilder, varlist=[ 'TARGET_NAME', 'TARGET_PATH', - 'COMPONENT_VS_PROJECT_SCRIPT_PATH', ]) vcprojbuilder = SCons.Script.Builder( action=vcprojaction, diff --git a/site_scons/site_tools/visual_studio_solution.py b/site_scons/site_tools/visual_studio_solution.py index 1e46767..4c18d23 100644 --- a/site_scons/site_tools/visual_studio_solution.py +++ b/site_scons/site_tools/visual_studio_solution.py @@ -71,7 +71,7 @@ def Solution(env, solution_name, build_targets = [e.subst('$TARGET_ROOT') for e in environments] # pick out sources, headers, and resources sources, headers, resources, others = env.GatherInputs( - [env.Dir('$DESTINATION_ROOT')], + [SCons.Script.Dir('$DESTINATION_ROOT')], ['.+\\.(c|cc|m|mm|cpp)$', # source files '.+\\.(h|hh|hpp)$', # header files '.+\\.(rc)$', # resource files |