diff options
Diffstat (limited to 'chrome/SConscript')
| -rw-r--r-- | chrome/SConscript | 22 |
1 files changed, 12 insertions, 10 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) |