Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8396)

Unified Diff: chrome/SConscript

Issue 7847: Using $CHROME_SRC_DIR in place of hash/..... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/googleurl_unittests.scons ('k') | chrome/SConscript.automated_ui_tests » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/SConscript
===================================================================
--- chrome/SConscript (revision 3721)
+++ chrome/SConscript (working copy)
@@ -30,7 +30,7 @@
],
CPPPATH = [
'.',
- '#/..',
+ '$CHROME_SRC_DIR',
# For app/chrome_dll.res to #include installer_util_strings.rc.
'$CHROME_DIR/installer/util',
],
@@ -213,24 +213,24 @@
# 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 @@
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 @@
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 @@
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)
« no previous file with comments | « build/googleurl_unittests.scons ('k') | chrome/SConscript.automated_ui_tests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698