diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 5 | ||||
| -rw-r--r-- | chrome/app/theme/SConscript | 3 | ||||
| -rw-r--r-- | chrome/installer/util/SConscript | 1 | ||||
| -rw-r--r-- | chrome/test/automation/SConscript | 6 |
4 files changed, 6 insertions, 9 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index ce800c8..985e564 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -41,6 +41,7 @@ if env_res['PLATFORM'] == 'win32': browser_res = env_res.RES('browser/browser_resources.rc') chrome_dll_res = env_res.RES('app/chrome_dll.rc') + env_res.Depends(chrome_dll_res, 'installer/util/installer_util_strings.rc') common_res = env_res.RES('common/common_resources.rc') debugger_res = env_res.RES('browser/debugger/resources/debugger_resources.rc') renderer_res = env_res.RES('renderer/renderer_resources.rc') @@ -241,8 +242,10 @@ if env_dll['PLATFORM'] == 'win32': env['BUILDERS']['ChromeVersionRC'] = b env.Replace( + # NOTE: the / after $CHROME_SRC_DIR/chrome/ is required because + # version.bat assumes a path with a trailing slash. CHROME_VERSION_RC_COM = - '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome $PWD $TARGET', + '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome/ $PWD $TARGET', VERSION_BAT = env.File( '$CHROME_SRC_DIR/chrome/tools/build/win/version.bat'), PWD = Dir('.'), diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript index 6c013ca..1f2c9c4 100644 --- a/chrome/app/theme/SConscript +++ b/chrome/app/theme/SConscript @@ -42,11 +42,10 @@ env.Append( ], ) -themes_default = env.ChromeSharedLibrary("$CHROME_DIR/themes/default", res) +themes_default = env.ChromeSharedLibrary("default", res) # TODO(bradnelson): figure out why this was needed #env.AddPostAction(themes_default[1], Touch(themes_default[1:])) i = env.Install("$TARGET_ROOT/themes", themes_default) env.Alias('chrome', i) - diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index eaa9fb5..27fd6f9 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -73,4 +73,3 @@ env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', '$CHROME_DIR/app/generated_resources.grd'] + env.Glob('$CHROME_DIR/app/resources/*.xtb'), "$PYTHON ${SOURCES[0]} ${TARGET.dir}") - diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript index 1b9d786..11cead9 100644 --- a/chrome/test/automation/SConscript +++ b/chrome/test/automation/SConscript @@ -27,8 +27,4 @@ input_files = [ 'window_proxy.cc', ] -lib = env.ChromeStaticLibrary('automation', input_files) - -i = env.Install('$TARGET_ROOT', lib) -#env.Alias('chrome', i) - +env.ChromeStaticLibrary('automation', input_files) |