diff options
60 files changed, 105 insertions, 102 deletions
diff --git a/base/base_lib.scons b/base/base_lib.scons index c18a5c4..ee12592 100644 --- a/base/base_lib.scons +++ b/base/base_lib.scons @@ -16,7 +16,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/base/base_unittests.scons b/base/base_unittests.scons index 3675e52..628970d 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -27,7 +27,7 @@ if env['PLATFORM'] in ('posix', 'darwin'): env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], CPPDEFINES = [ 'GOOGLE_CHROME_BUILD', @@ -63,7 +63,7 @@ if env['PLATFORM'] == 'posix': # Explicity list the functions we want to export from the base_unittest # executable in the following file. env['EXPORTED_SYMBOLS_FILE'] = \ - env.File('$ROOT_DIR/base/base_unittest_exported_symbols.version') + env.File('$CHROME_SRC_DIR/base/base_unittest_exported_symbols.version') env.Append( LIBS = [ diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons index 9a5e992..9892d66 100644 --- a/base/gfx/base_gfx.scons +++ b/base/gfx/base_gfx.scons @@ -19,7 +19,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/breakpad/SConscript b/breakpad/SConscript index 8e1008b..0a8f771 100644 --- a/breakpad/SConscript +++ b/breakpad/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ 'src', - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/build/SConscript.main b/build/SConscript.main index f8e6882..1bc7548 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -28,9 +28,9 @@ else: env = Environment( BUILD_TYPE = ARGUMENTS.get('BUILD_TYPE', 'Hammer'), - TARGET_ROOT = '#/$BUILD_TYPE', + CHROME_SRC_DIR = Dir('#/..').abspath, + TARGET_ROOT = Dir('#/$BUILD_TYPE').abspath, OBJ_ROOT = '$TARGET_ROOT', - ROOT_DIR = '#/..', LIBS_DIR = '$OBJ_ROOT/Libs', @@ -456,8 +456,8 @@ env.Decider('MD5-timestamp') # Overlay things from a layer below. -env.Dir('$TARGET_ROOT').addRepository(Dir('#/..')) -env.Dir('$TARGET_ROOT/googleurl').addRepository(env.Dir('$ROOT_DIR/build')) +env.Dir('$TARGET_ROOT').addRepository(env.Dir('$CHROME_SRC_DIR')) +env.Dir('$TARGET_ROOT/googleurl').addRepository(env.Dir('$CHROME_SRC_DIR/build')) included = [c for c in load if not c.startswith('-')] excluded = [c[1:] for c in load if c.startswith('-')] @@ -539,7 +539,7 @@ if LoadComponent('third_party'): '$BSPATCH_DIR/SConscript', ]) -if LoadComponent('v8') and env.Dir('#/../v8').exists(): +if LoadComponent('v8') and env.Dir('$CHROME_SRC_DIR/v8').exists(): env.SConscript('SConscript.v8', exports=['env']) diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 8eeef09..2d24fcf 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -13,7 +13,7 @@ except AttributeError: env = env.Clone( V8_MODE = 'release', - V8_SRC_DIR = '#/../v8', + V8_SRC_DIR = '$CHROME_SRC_DIR/v8', V8_MODE_DIR = '$V8_SRC_DIR/obj/$V8_MODE', V8_SCONS_COM = 'cd ../v8 && $PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', SCONS='../third_party/scons/scons.py', @@ -49,7 +49,7 @@ v8_scons_targets_on = [ if env['PLATFORM'] == 'win32': v8_scons_targets_off.extend([ - env.File('#/../v8/vc80.pdb') + env.File('$CHROME_SRC_DIR/v8/vc80.pdb') ]) v8 = env.Command(v8_scons_targets_off + v8_scons_targets_on, diff --git a/build/googleurl_lib.scons b/build/googleurl_lib.scons index cbb403f..6738fea 100644 --- a/build/googleurl_lib.scons +++ b/build/googleurl_lib.scons @@ -16,7 +16,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/build/googleurl_unittests.scons b/build/googleurl_unittests.scons index 2da2e47..851f85a 100644 --- a/build/googleurl_unittests.scons +++ b/build/googleurl_unittests.scons @@ -14,12 +14,12 @@ env.SConscript([ '$BASE_DIR/using_base.scons', '$ICU38_DIR/using_icu38.scons', '$GTEST_DIR/../using_gtest.scons', - '#/../build/using_googleurl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', ], {'env':env}) env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) 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', diff --git a/gears/SConscript.googleurl b/gears/SConscript.googleurl index 6cc9d4d1f..969b28a 100644 --- a/gears/SConscript.googleurl +++ b/gears/SConscript.googleurl @@ -85,7 +85,7 @@ env.ChromeStaticLibrary('googleurl-gears', input_files) # # # The version of gtest that googleurl uses provides a main() function; ours # # doesn't so include our own main function. -# '#/../base/run_all_unittests.cc' +# '$CHROME_SRC_DIR/base/run_all_unittests.cc' #] # #gurl_unittests = env_tests.ChromeTestProgram('googleurl_unittests', test_files) diff --git a/net/crash_cache.scons b/net/crash_cache.scons index 6ef6860..812f30c 100644 --- a/net/crash_cache.scons +++ b/net/crash_cache.scons @@ -22,7 +22,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/net/net_lib.scons b/net/net_lib.scons index ee57964..7de96f0 100644 --- a/net/net_lib.scons +++ b/net/net_lib.scons @@ -20,7 +20,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/net/net_perftests.scons b/net/net_perftests.scons index 8c25187..506d85e 100644 --- a/net/net_perftests.scons +++ b/net/net_perftests.scons @@ -17,7 +17,7 @@ env.SConscript([ '$NET_DIR/using_net.scons', '$BASE_DIR/using_base.scons', - '#/../build/using_googleurl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', '$MODP_B64_DIR/using_modp_b64.scons', @@ -30,7 +30,7 @@ if env['PLATFORM'] in ('posix', 'darwin'): env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/net/net_resources.scons b/net/net_resources.scons index bbce3c4..aebf0d2 100644 --- a/net/net_resources.scons +++ b/net/net_resources.scons @@ -12,7 +12,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], RCFLAGS = [ ['/l', '0x409'], diff --git a/net/net_unittests.scons b/net/net_unittests.scons index 374f0f1..dbb0534 100644 --- a/net/net_unittests.scons +++ b/net/net_unittests.scons @@ -18,7 +18,7 @@ env.SConscript([ '$BZIP2_DIR/using_bzip2.scons', '$BASE_DIR/using_base.scons', - '#/../build/using_googleurl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', '$MODP_B64_DIR/using_modp_b64.scons', @@ -34,7 +34,7 @@ if env['PLATFORM'] in ('posix', 'darwin'): env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/net/stress_cache.scons b/net/stress_cache.scons index ea8ff17..f0d706e 100644 --- a/net/stress_cache.scons +++ b/net/stress_cache.scons @@ -22,7 +22,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons index 4819883..ad743c6 100644 --- a/net/tools/tld_cleanup/tld_cleanup.scons +++ b/net/tools/tld_cleanup/tld_cleanup.scons @@ -12,14 +12,14 @@ env = env.Clone() env.SConscript([ '$BASE_DIR/using_base.scons', - '#/../build/using_googleurl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', '$ICU38_DIR/using_icu38.scons', '$NET_DIR/using_net.scons', ], {'env':env}) env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/skia/SConscript b/skia/SConscript index fd642ae..283d371 100644 --- a/skia/SConscript +++ b/skia/SConscript @@ -13,7 +13,7 @@ env.Prepend( 'corecg', 'sgl', 'picture', - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons index 7acba1c..0f8bd89 100644 --- a/third_party/libpng/libpng.scons +++ b/third_party/libpng/libpng.scons @@ -17,7 +17,7 @@ env.SConscript([ env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/third_party/modp_b64/modp_b64.scons b/third_party/modp_b64/modp_b64.scons index 02cefb4..edf9650b 100644 --- a/third_party/modp_b64/modp_b64.scons +++ b/third_party/modp_b64/modp_b64.scons @@ -14,7 +14,7 @@ env = env.Clone( env.Prepend( CPPPATH = [ - '$ROOT_DIR', + '$CHROME_SRC_DIR', ], ) diff --git a/webkit/SConscript b/webkit/SConscript index 77e4a1a..f314da9 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -31,8 +31,8 @@ env_res = env.Clone() # or not the file involved is a generated file or checked-in source. port_dir = env.Dir('$WEBKIT_DIR/port') -port_dir.addRepository(env.Dir('#/../webkit/port')) -port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore')) +port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port')) +port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore')) if env['PLATFORM'] == 'win32': env['WEBKIT_PLATFORM_SUBDIR'] = 'win' @@ -141,7 +141,7 @@ env.Prepend( '$WEBKIT_DIR/port/svg/animation', '$WEBKIT_DIR/port/svg/graphics/filters', - '#/..', + '$CHROME_SRC_DIR', ], ) @@ -263,7 +263,7 @@ if env['PLATFORM'] == 'win32': version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', ['$WEBCORE_DIR/Configurations/Version.xcconfig', - '#/../webkit/build/webkit_version.py'], + '$CHROME_SRC_DIR/webkit/build/webkit_version.py'], "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") env.AlwaysBuild(version) diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre index d13267c..1961d93 100644 --- a/webkit/SConscript.javascriptcore_pcre +++ b/webkit/SConscript.javascriptcore_pcre @@ -31,8 +31,8 @@ if env['PLATFORM'] == 'win32': dir = env.Dir('$PCRE_DIR') -dir.addRepository(env.Dir('#/../webkit/pending')) -dir.addRepository(env.Dir('#/../third_party/WebKit/JavaScriptCore/pcre')) +dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/pending')) +dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/pcre')) input_files = [ '$PCRE_DIR/pcre_compile.cpp', diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript index cf235e6..8845906 100644 --- a/webkit/activex_shim/SConscript +++ b/webkit/activex_shim/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '$NPAPI_DIR', - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript index a4dc1b2..f451ac2 100644 --- a/webkit/activex_shim_dll/SConscript +++ b/webkit/activex_shim_dll/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '$NPAPI_DIR', - '#/..', + '$CHROME_SRC_DIR', ], LIBS = [ 'activex_shim', diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 0efe311..7fa5242 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -16,7 +16,7 @@ hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $T env.Replace( CREATE_HASH_TABLE_COM = hash_table_cmd, - CREATE_HASH_TABLE = env.File('#/../third_party/WebKit/JavaScriptCore/kjs/create_hash_table'), + CREATE_HASH_TABLE = env.File('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/kjs/create_hash_table'), CREATE_HASH_TABLE_FLAGS = '-i', ) @@ -110,7 +110,7 @@ env = env.Clone( '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', '$WEBKIT_DIR', - '#/..', + '$CHROME_SRC_DIR', ], ) diff --git a/webkit/build/localized_strings/SConscript b/webkit/build/localized_strings/SConscript index 05db1b8..d48719f 100644 --- a/webkit/build/localized_strings/SConscript +++ b/webkit/build/localized_strings/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"], @@ -21,13 +21,13 @@ env_res.Append( import os 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')]) # This dummy target (webkit_strings) is used to tell the emitter where # to put the target files. generated = env_grd.GRIT('webkit_strings', - '#/../webkit/glue/webkit_strings.grd') + '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd') for g in [ g for g in generated if str(g).endswith('.rc') ]: env_res.RES(g) diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 08030f9..cc9b462 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -42,7 +42,7 @@ env = env.Clone( BINDINGS_SCRIPT = '$BINDINGS_SCRIPTS_DIR/generate-bindings.pl', PERL_INCLUDE_PATH = ['$BINDINGS_SCRIPTS_DIR', - '#/../third_party/WebKit/WebCore/bindings/scripts'], + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/bindings/scripts'], WEBKIT_PORT_DIR = '$WEBKIT_DIR/port', @@ -483,9 +483,9 @@ idl_files = [ for subdir in set([os.path.dirname(n) for n in idl_files]): dir = env.Dir('$OBJ_ROOT/webkit/port/' + subdir) - dir.addRepository(env.Dir('#/../webkit/pending')) - dir.addRepository(env.Dir('#/../webkit/port/' + subdir)) - dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore/' + subdir)) + dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/pending')) + dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port/' + subdir)) + dir.addRepository(env.Dir('$CHROME_SRC_DIR/third_party/WebKit/WebCore/' + subdir)) for name in idl_files: env.Bindings('$WEBKIT_DIR/port/' + name) diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript index 571e64d..5561bc1 100644 --- a/webkit/default_plugin/SConscript +++ b/webkit/default_plugin/SConscript @@ -8,12 +8,12 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '#/../webkit/glue', + '$CHROME_SRC_DIR/webkit/glue', '$ICU38/public/common', '$ICU38/public/i18n', - '#/../third_party/libxml/include', - '#/../third_party/npapi', - '#/..', + '$CHROME_SRC_DIR/third_party/libxml/include', + '$CHROME_SRC_DIR/third_party/npapi', + '$CHROME_SRC_DIR', ], ) diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 1fd70e631..ec3bf02 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -11,7 +11,7 @@ if env['PLATFORM'] == 'win32': env_res.Append( CPPPATH = [ '.', - '#/..', + '$CHROME_SRC_DIR', '$NET_DIR', ], RCFLAGS = [ |