Using $CHROME_SRC_DIR in place of hash/..

This will facilitate changing where the main sconstruct lives.

Review URL: http://codereview.chromium.org/7847

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3725 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 25 insertions, 25 deletions

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 = [