diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 20:58:34 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 20:58:34 +0000 |
| commit | ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7 (patch) | |
| tree | 865833372db3f4c6cf9e3824206ec19db7d46aaf /chrome/SConscript | |
| parent | c4269ebd7bdebacfdbd375a7db135c641b6cbd3e (diff) | |
| download | chromium_src-ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7.zip chromium_src-ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7.tar.gz chromium_src-ae607dc8ef50d1ccdbc459d3793f9c6b40408dd7.tar.bz2 | |
Fix SCons breakage, plus latest updates:
* Update src/DEPS to latest icu38 rev.
* Add new browser/views/frame/*.cc files.
* Add new browser/debugger/debugger_contents.cc file.
* Add new views/dialog_client_view.cc file.
* Build new browser/debugger/resources/debugger_resources.rc file.
* Add a new ChromeVersionRC() builder to the environment to provide a simpler, abstract interface for the four *version.rc files we build, with fixed definitions of $VERSION_BAT and $CHROME_SRC_DIR.
* Fix the definition of $HTML_INLINE.
R=deanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript')
| -rw-r--r-- | chrome/SConscript | 60 |
1 files changed, 39 insertions, 21 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index de2da4f..52b4a17 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -61,6 +61,7 @@ env_res.Append( browser_res = env_res.RES('browser/browser_resources.rc')
chrome_dll_res = env_res.RES('app/chrome_dll.rc')
common_res = env_res.RES('common/common_resources.rc')
+debugger_res = env_res.RES('browser/debugger/resources/debugger_resources.rc')
renderer_res = env_res.RES('renderer/renderer_resources.rc')
test_data_res = env_res.RES('test/data/resource.rc')
webkit_res = env_res.RES('$WEBKIT_DIR/glue/webkit_resources.rc')
@@ -71,6 +72,7 @@ dll_resources = [ browser_res,
chrome_dll_res,
common_res,
+ debugger_res,
net_res,
renderer_res,
webkit_res,
@@ -238,32 +240,48 @@ for g in [ g for g in generated if str(g).endswith('.rc') ]: -env_version = env.Clone(
- VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),
- CHROMEDIR = env.Dir('$CHROME_DIR'),
- PWD = env.Dir('.'),
-)
+def chrome_version_emitter(target, source, env):
+ source.append('$CHROME_SRC_DIR/VERSION')
+ source.append('$CHROME_SRC_DIR/BRANDING')
+ return target, source
+
+b = Builder(action = '$CHROME_VERSION_RC_COM',
+ emitter = chrome_version_emitter)
-env_version['ENV']['PROGRAMFILES'] = os.environ['PROGRAMFILES']
-env_version['ENV']['SystemDrive'] = os.environ['SystemDrive']
-env_version['ENV']['USERPROFILE'] = os.environ['USERPROFILE']
-env_version['ENV']['PATH'] = os.environ['PATH']
+env['BUILDERS']['ChromeVersionRC'] = b
+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'),
+ PWD = Dir('.'),
+)
-chrome_exe_version_rc = env_version.Command(
+chrome_exe_version_rc = env.ChromeVersionRC(
'chrome_exe_version.rc',
- ['app/chrome_exe_version.rc.version',
- '$CHROME_DIR/VERSION',
- '$CHROME_DIR/BRANDING'],
- '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')
+ 'app/chrome_exe_version.rc.version'
+)
-chrome_dll_version_rc = env_version.Command(
+chrome_dll_version_rc = env.ChromeVersionRC(
'chrome_dll_version.rc',
- ['app/chrome_dll_version.rc.version',
- '$CHROME_DIR/VERSION',
- '$CHROME_DIR/BRANDING',
- ],
- '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')
+ 'app/chrome_dll_version.rc.version',
+)
+
+
+#chrome_exe_version_rc = env_version.Command(
+# 'chrome_exe_version.rc',
+# ['app/chrome_exe_version.rc.version',
+# '$CHROME_SRC_DIR/VERSION',
+# '$CHROME_SRC_DIR/BRANDING'],
+# '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET')
+#
+#chrome_dll_version_rc = env_version.Command(
+# 'chrome_dll_version.rc',
+# ['app/chrome_dll_version.rc.version',
+# '$CHROME_SRC_DIR/VERSION',
+# '$CHROME_SRC_DIR/BRANDING',
+# ],
+# '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET')
Depends(chrome_dll_res, chrome_dll_version_rc)
@@ -390,7 +408,7 @@ env_snapshot.Command('snapshot.cc', '#/../v8/bin/debug/mksnapshot.exe', env_flat = env.Clone(
BROWSER_RESOURCES = Dir('browser_resources'),
- HTML_INLINE = File('$CHROME_DIR/tools/build/win/html_inline.py'),
+ HTML_INLINE = File('#/../chrome/tools/build/win/html_inline.py'),
FLATTEN_HTML_COM = '$PYTHON $HTML_INLINE $SOURCE $TARGET',
)
|