diff options
Diffstat (limited to 'chrome')
32 files changed, 51 insertions, 48 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 6a0e61e..77f4bc5 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -30,7 +30,7 @@ if env_res['PLATFORM'] == 'win32': ], CPPPATH = [ '.', - '#/..', + '$CHROME_SRC_DIR', # For app/chrome_dll.res to #include installer_util_strings.rc. '$CHROME_DIR/installer/util', ], @@ -213,24 +213,24 @@ else: # TODO(sgk): make a pseudo-Builder for these import sys -sys.path.append(Dir('#/../tools/grit').abspath) +sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath) env_grd = env.Clone() -env_grd.Tool('scons', toolpath=['#/../tools/grit/grit']) +env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')]) # NOTE: fake target gets replaced with real targets from reading .grd generated = env_grd.GRIT('app/resources/fake_generated_target', - '#/../chrome/app/generated_resources.grd') + '$CHROME_SRC_DIR/chrome/app/generated_resources.grd') grit_files.extend(generated) # NOTE: fake target gets replaced with real targets from reading .grd chromium = env_grd.GRIT('app/resources/fake_chromium_target', - '#/../chrome/app/chromium_strings.grd') + '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd') grit_files.extend(chromium) # NOTE: fake target gets replaced with real targets from reading .grd google_chrome = env_grd.GRIT('app/resources/fake_google_chrome_target', - '#/../chrome/app/google_chrome_strings.grd') + '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd') grit_files.extend(google_chrome) @@ -258,8 +258,9 @@ if env_dll['PLATFORM'] == 'win32': env.Replace( CHROME_VERSION_RC_COM = '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET', - VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'), - CHROME_SRC_DIR = Dir('#/../chrome'), + VERSION_BAT = env.File( + '$CHROME_SRC_DIR/chrome/tools/build/win/version.bat'), + CHROME_SRC_DIR = env.Dir('$CHROME_SRC_DIR/chrome'), PWD = Dir('.'), ) @@ -365,7 +366,8 @@ if env['PLATFORM'] == 'win32': env_flat = env.Clone( BROWSER_RESOURCES = Dir('browser_resources'), - HTML_INLINE = File('#/../chrome/tools/build/win/html_inline.py'), + HTML_INLINE = env.File( + '$CHROME_SRC_DIR/chrome/tools/build/win/html_inline.py'), FLATTEN_HTML_COM = '$PYTHON $HTML_INLINE $SOURCE $TARGET', ) @@ -481,7 +483,7 @@ if env['PLATFORM'] == 'win32': i = env.Command('$TARGET_ROOT/resources/inspector', - '#/../webkit/port/page/inspector', + '$CHROME_SRC_DIR/webkit/port/page/inspector', Copy('$TARGET', '$SOURCE'), source_scanner=DirScanner) env.Alias('chrome', i) diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests index 8d2629c..b4b15bb 100644 --- a/chrome/SConscript.automated_ui_tests +++ b/chrome/SConscript.automated_ui_tests @@ -15,7 +15,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', '$GTEST_DIR/include', 'third_party/wtl/include', 'tools/build/win', diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 68ce7c7..07c8e4a 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -14,7 +14,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', '$GTEST_DIR/include', 'third_party/wtl/include', '$LIBXSLT_DIR', diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript index 3b995db..519e929 100644 --- a/chrome/app/resources/SConscript +++ b/chrome/app/resources/SConscript @@ -10,9 +10,9 @@ env_res = env_res.Clone() env_res.Append( CPPPATH = [ '.', - '#/../chrome/Debug/obj/chrome_dll', - '#/..', - '#/../chrome/Debug/obj', + '$CHROME_SRC_DIR/chrome/Debug/obj/chrome_dll', + '$CHROME_SRC_DIR', + '$CHROME_SRC_DIR/chrome/Debug/obj', ], RCFLAGS = [ ['/l', '0x409'], diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript index 80a9cea..8efaa2e 100644 --- a/chrome/app/theme/SConscript +++ b/chrome/app/theme/SConscript @@ -10,7 +10,7 @@ env_res = env_res.Clone() env_res.Append( CPPPATH = [ '.', - '#/..', + '$CHROME_SRC_DIR', ], RCFLAGS = [ ['/l', '0x409'], diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index a6bccad..cee19af 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -12,7 +12,7 @@ env.Prepend( '$CHROME_DIR/app/resources', #'$OBJ_ROOT/google_update', '#/tools/build/win', - '#/..', + '$CHROME_SRC_DIR', ], CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', diff --git a/chrome/browser/debugger/SConscript b/chrome/browser/debugger/SConscript index 6f943fd..362a2c4 100644 --- a/chrome/browser/debugger/SConscript +++ b/chrome/browser/debugger/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '#/..', + '$CHROME_SRC_DIR', ], CPPDEFINES = [ 'LIBXML_STATIC', diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript index aec22cd..941c971 100644 --- a/chrome/browser/views/SConscript +++ b/chrome/browser/views/SConscript @@ -12,7 +12,7 @@ env.Prepend( '$CHROME_DIR/app/resources', #'$OBJ_ROOT/google_update', '#/tools/build/win', - '#/..', + '$CHROME_SRC_DIR', ], CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', diff --git a/chrome/common/SConscript b/chrome/common/SConscript index 5b8c414..e8ce0ac 100644 --- a/chrome/common/SConscript +++ b/chrome/common/SConscript @@ -10,7 +10,7 @@ env.Prepend( CPPPATH = [ '$CHROME_DIR/app/resources', '#/tools/build/win', - '#/..', + '$CHROME_SRC_DIR', ], CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', @@ -131,7 +131,7 @@ env_test.Append( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', '$GTEST_DIR/include', ], LIBS = [ diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index f2a8269..e1dfe0c 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -17,7 +17,7 @@ env_res.Append( CPPPATH = [ "$TARGET_ROOT", ".", - "#/..", + "$CHROME_SRC_DIR", ], RCFLAGS = [ ["/l", "0x409"], @@ -31,7 +31,7 @@ env.Prepend( CPPPATH = [ '$GTEST_DIR/include', '$GTEST_DIR', - '#/..', + '$CHROME_SRC_DIR', ], CCFLAGS = [ '/TP', @@ -109,7 +109,7 @@ env_test.Prepend( CPPPATH = [ '$GTEST_DIR/include', '$GTEST_DIR', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'gtest', diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index a920f31..edd5a3e 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -12,7 +12,7 @@ env_res.Append( CPPPATH = [ "$TARGET_ROOT", ".", - "#/..", + "$CHROME_SRC_DIR", ], RCFLAGS = [ ["/l", "0x409"], @@ -30,7 +30,7 @@ env.Prepend( '../util', '$TARGET_ROOT', '.', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'base', diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index 706cff9..fde62a7a 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -22,7 +22,7 @@ env.Prepend( '$LIBJPEG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '#/..', + '$CHROME_SRC_DIR', '.', ], CPPDEFINES = [ @@ -66,7 +66,8 @@ x = env.ChromeStaticLibrary('util', input_files) # create_string_rc.py imports FP.py from the tools/grit/grit/extern # directory, so add that to PYTHONPATH for this command execution. env_x = env.Clone() -env_x.AppendENVPath('PYTHONPATH', [Dir('#/../tools/grit/grit/extern').abspath]) +env_x.AppendENVPath('PYTHONPATH', + [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', '$CHROME_DIR/installer/util/installer_util_strings.h'], ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', diff --git a/chrome/plugin/SConscript b/chrome/plugin/SConscript index c11e01b..937d001 100644 --- a/chrome/plugin/SConscript +++ b/chrome/plugin/SConscript @@ -14,7 +14,7 @@ env.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript index 4beed7b..eca07dc 100644 --- a/chrome/renderer/SConscript +++ b/chrome/renderer/SConscript @@ -11,7 +11,7 @@ env.Prepend( CPPPATH = [ '$CHROME_DIR/app/resources', '#/tools/build/win', - '#/..', + '$CHROME_SRC_DIR', ], CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript index edcf12b..94598d2 100644 --- a/chrome/test/activex_test_control/SConscript +++ b/chrome/test/activex_test_control/SConscript @@ -10,7 +10,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '.', - '#/..', + '$CHROME_SRC_DIR', ], LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript index 2713f89..71a09c1 100644 --- a/chrome/test/automation/SConscript +++ b/chrome/test/automation/SConscript @@ -13,7 +13,7 @@ env.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript index 0f64256..8e6ed50 100644 --- a/chrome/test/chrome_plugin/SConscript +++ b/chrome/test/chrome_plugin/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'googleurl', diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index 18b4e1d..3e79dde 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -20,7 +20,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', '$CHROME_DIR/third_party/wtl/include', '$LIBXSLT_DIR', '$LIBXML_DIR/include', diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript index e0bb274..75a595f 100644 --- a/chrome/test/memory_test/SConscript +++ b/chrome/test/memory_test/SConscript @@ -18,7 +18,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'automation', diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript index 99ebfed..8664b97 100644 --- a/chrome/test/mini_installer_test/SConscript +++ b/chrome/test/mini_installer_test/SConscript @@ -15,7 +15,7 @@ env_test.Prepend( CPPPATH = [ '$GTEST_DIR/include', '$GTEST_DIR', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'util', diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript index 4e0aef6..82530dc 100644 --- a/chrome/test/page_cycler/SConscript +++ b/chrome/test/page_cycler/SConscript @@ -18,7 +18,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'googleurl', diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript index 432cd64..1fdc1d3 100644 --- a/chrome/test/plugin/SConscript +++ b/chrome/test/plugin/SConscript @@ -20,7 +20,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', '$LIBXSLT_DIR', '$LIBXML_DIR/includ', ], diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript index 89453d0..0922599 100644 --- a/chrome/test/reliability/SConscript +++ b/chrome/test/reliability/SConscript @@ -19,7 +19,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'googleurl', diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript index 8908aa9..0e6b4890 100644 --- a/chrome/test/security_tests/SConscript +++ b/chrome/test/security_tests/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript index c06189f..6153dc8 100644 --- a/chrome/test/selenium/SConscript +++ b/chrome/test/selenium/SConscript @@ -17,7 +17,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'googleurl', diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript index 9541815..9e95689 100644 --- a/chrome/test/startup/SConscript +++ b/chrome/test/startup/SConscript @@ -17,7 +17,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'googleurl', diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript index e54372f..7fd9974d 100644 --- a/chrome/test/tab_switching/SConscript +++ b/chrome/test/tab_switching/SConscript @@ -17,7 +17,7 @@ env_test.Prepend( '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'googleurl', diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript index 2fd99ee..1c6b96e 100644 --- a/chrome/third_party/hunspell/SConscript +++ b/chrome/third_party/hunspell/SConscript @@ -36,7 +36,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '$ICU38_DIR/public/common', - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript index 35bbfc5..fc4cc4e 100644 --- a/chrome/tools/crash_service/SConscript +++ b/chrome/tools/crash_service/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '$BREAKPAD_DIR/src', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'base', diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript index 5bf1fe6..a33cb3c 100644 --- a/chrome/tools/perf/flush_cache/SConscript +++ b/chrome/tools/perf/flush_cache/SConscript @@ -8,7 +8,7 @@ env_test = env_test.Clone() env_test.Prepend( CPPPATH = [ - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript index 0485e01..7b1ed3a 100644 --- a/chrome/tools/test/image_diff/SConscript +++ b/chrome/tools/test/image_diff/SConscript @@ -15,7 +15,7 @@ env_test.Prepend( CPPPATH = [ '$ZLIB_DIR', '$LIBPNG_DIR', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'skia', diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 832db30..8836d09 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -10,7 +10,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', - '#/..', + '$CHROME_SRC_DIR', ], CCFLAGS = [ '/TP', |