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

7 files changed, 55 insertions, 56 deletions

diff --git a/DEPS b/DEPS
index 6ef3f03..f5246e4 100644
--- a/DEPS
+++ b/DEPS
@@ -12,11 +12,11 @@ deps = {
     "svn://chrome-svn/chrome/trunk/third_party/WebKit@19",

 

   "src/third_party/icu38":

-    "svn://chrome-svn/chrome/trunk/third_party/icu38@19",

+    "svn://chrome-svn/chrome/trunk/third_party/icu38@179",

 

   "src/v8":

     "https://svn/r/googleclient/v8/trunk@129455",

 

   "src/webkit/data/layout_tests/LayoutTests":

     "http://svn.webkit.org/repository/webkit/branches/Safari-3-1-branch/LayoutTests@31256",

-}
\ No newline at end of file
+}

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',

 )

 

diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index ad48d53..1596210 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -320,6 +320,11 @@ input_files = [
     'views/first_run_customize_view.cc',

     'views/first_run_view.cc',

     'views/first_run_view_base.cc',

+    'views/frame/aero_glass_frame.cc',

+    'views/frame/aero_glass_non_client_view.cc',

+    'views/frame/browser_view.cc',

+    'views/frame/opaque_frame.cc',

+    'views/frame/opaque_non_client_view.cc',

     'views/go_button.cc',

     'views/html_dialog_view.cc',

     'views/hung_renderer_view.cc',

diff --git a/chrome/browser/debugger/SConscript b/chrome/browser/debugger/SConscript
index 3a7b92a..5b21722 100644
--- a/chrome/browser/debugger/SConscript
+++ b/chrome/browser/debugger/SConscript
@@ -65,9 +65,10 @@ env.Append(
 )

 

 input_files = [

-    'debugger_shell.cc',

+    'debugger_contents.cc',

     'debugger_io_socket.cc',

     'debugger_node.cc',

+    'debugger_shell.cc',

     'debugger_view.cc',

     'debugger_window.cc',

     'debugger_wrapper.cc',

diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index d75e02f..aac6f0a 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -134,18 +134,9 @@ packed = env.Command('$TARGET_ROOT/packed_files.txt',
 env.Depends(packed, '$TARGET_ROOT/setup.exe')

 

 

-env_version = env.Clone(

-    VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),

-    CHROMEDIR = env.Dir('$CHROME_DIR'),

-    PWD = env.Dir('.'),

-)

-

-env_version.Command('mini_installer_exe_version.rc',

-                    ['mini_installer_exe_version.rc.version',

-                     '$CHROME_DIR/VERSION',

-                     '$CHROME_DIR/BRANDING'

-                    ],

-                    "$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET")

+env.ChromeVersionRC('mini_installer_exe_version.rc',

+                    'mini_installer_exe_version.rc.version',

+                    PWD=Dir('.'))

 

 

 env_test.Prepend(

diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index c7a3f9d..65c6087 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -132,23 +132,6 @@ i = env.Install('$TARGET_ROOT', exe)
 env.Alias('chrome', i)

 

 

-

-env_version = env.Clone(

-    VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),

-    CHROMEDIR = env.Dir('$CHROME_DIR'),

-    PWD = env.Dir('.'),

-)

-

-import os

-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']

-

-setup_exe_version_rc = env_version.Command(

-    'setup_exe_version.rc',

-    ['setup_exe_version.rc.version',

-     '$CHROME_DIR/VERSION',

-     '$CHROME_DIR/BRANDING'

-    ],

-    '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')

+env.ChromeVersionRC('setup_exe_version.rc',

+                    'setup_exe_version.rc.version',

+                    PWD = env.Dir('.'))

diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index a433eeb..49cc275 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -71,6 +71,7 @@ input_files = [
     'client_view.cc',

     'combo_box.cc',

     'custom_frame_window.cc',

+    'dialog_client_view.cc',

     'decision.cc',

     'event.cc',

     'external_focus_tracker.cc',