Create chrome_resources.scons, chrome_strings.scons and theme_dll.scons

which mirror the vcproj files used by Windows.

Add the linux specific code to generate .pak files that we use for
resources on linux.

This doesn't include the necessary changes to build the theme default.dll on
windows, but the windows scons build is already really broken so punting for
now.

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


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

7 files changed, 89 insertions, 222 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 884ee96..b160928 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -61,70 +61,6 @@ if env_res.Bit('windows'):
   ]
 
 ##############################################################################
-# TODO(sgk):  move to separate .scons file for generated_resources ###########
-
-env_grd = env.Clone()
-env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
-
-grd_files = [
-  # Strings
-  '$CHROME_SRC_DIR/chrome/app/generated_resources.grd',
-  '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd',
-  '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd',
-
-  # Data resources
-  '$CHROME_SRC_DIR/chrome/browser/browser_resources.grd',
-  '$CHROME_SRC_DIR/chrome/browser/debugger/resources/debugger_resources.grd',
-  '$CHROME_SRC_DIR/chrome/common/common_resources.grd',
-  '$CHROME_SRC_DIR/chrome/renderer/renderer_resources.grd',
-]
-grit_files = []
-
-for grd_file in grd_files:
-  # NOTE: fake target gets replaced with real targets from reading .grd
-  generated = env_grd.GRIT(
-      '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file),
-      grd_file)
-  grit_files.extend(generated)
-
-input_files = ChromeFileList([
-    'app/generated_resources.grd',
-    'app/google_chrome_strings.grd',
-    'app/chromium_strings.grd',
-    Derived(env.File('$TARGET_ROOT/grit_derived_sources/'
-                     + 'generated_resources.h')),
-])
-
-p = env.ChromeMSVSProject('app/generated_resources.vcproj',
-                          dest=('$CHROME_SRC_DIR/chrome/'
-                                + 'app/generated_resources.vcproj'),
-                          guid='{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}',
-                          keyword='Win32Proj',
-                          # TODO(sgk):  when we can intuit the hierarchy
-                          # from the built targets.
-                          #buildtargets=TODO,
-                          files=input_files,
-                          relative_path_substitutions = [
-                            ('../../../grit_derived_sources', '$(IntDir)'),
-                          ],
-                          local_directory_prefix='./',
-                          ConfigurationType='10')
-
-p.AddToolFile('../tools/grit/build/grit_localized_resources.rules')
-
-p.AddConfig('Debug|Win32',
-            InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
-                '$(SolutionDir)../build/debug.vsprops',
-            ])
-
-p.AddConfig('Release|Win32',
-            InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
-                '$(SolutionDir)../build/release.vsprops',
-            ])
-
-##############################################################################
 # TODO(sgk):  move to separate .scons file for chrome.dll ####################
 
 env_dll = env.Clone()
@@ -306,9 +242,6 @@ if env_dll.Bit('windows'):
                                             PDB='chrome_dll.pdb')
   install_targets.extend(dll_targets)
 
-  for g in [ g for g in grit_files if str(g).endswith('.rc') ]:
-    env_res.RES(g)
-
   chrome_exe_version_rc = env.ChromeVersionRC(
       'chrome_exe_version.rc',
       'app/chrome_exe_version.rc.version'
@@ -669,59 +602,9 @@ p.AddConfig('Release|Win32',
 
 
 ##############################################################################
-# TODO(sgk):  move to separate .scons file for browser_resources #############
-
-input_files = ChromeFileList([
-    'browser/resources/about_credits.html',
-    'browser/resources/about_memory.html',
-    'browser/resources/about_stats.html',
-    'browser/resources/about_version.html',
-    'browser/resources/history.html',
-    'browser/resources/incognito_tab.html',
-    'browser/resources/new_tab.html',
-    'browser/resources/safe_browsing_malware_block.html',
-    'browser/resources/safe_browsing_phishing_block.html',
-    'browser/security/resources/ssl_error.html',
-    'browser/security/resources/ssl_roadblock.html',
-    'browser/security/resources/ssl_roadblock_background.png',
-    'browser/security/resources/ssl_roadblock_icon.png',
-])
-
-p = env.ChromeMSVSProject('browser/resources/browser_resources.vcproj',
-                          dest=('$CHROME_SRC_DIR/chrome/'
-                                + 'browser/resources/browser_resources.vcproj'),
-                          guid='{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}',
-                          # TODO(sgk):  when we can intuit the hierarchy
-                          # from the built targets.
-                          #buildtargets=TODO,
-                          files=input_files,
-                          local_directory_prefix='./',
-                          tools=[
-                              'VCPreBuildEventTool',
-                              'VCCustomBuildTool',
-                              'VCMIDLTool',
-                              'VCPostBuildEventTool',
-                          ],
-                          ConfigurationType='10')
-
-p.AddConfig('Debug|Win32',
-            InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
-                '$(SolutionDir)../build/debug.vsprops',
-            ])
-
-p.AddConfig('Release|Win32',
-            InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
-                '$(SolutionDir)../build/release.vsprops',
-            ])
-
-
-##############################################################################
-# TODO(sgk):  move to separate .scons file for browser_resources #############
+# TODO(sgk): Port these to browser_views.scons and views.scons.
 
 sconscript_files = [
-    'app/theme/SConscript',
     'browser/views/SConscript',
     'views/SConscript',
 ]
diff --git a/chrome/app/chrome_resources.scons b/chrome/app/chrome_resources.scons
new file mode 100644
index 0000000..6d0d32c
--- /dev/null
+++ b/chrome/app/chrome_resources.scons
@@ -0,0 +1,34 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+
+Import('env')
+
+env = env.Clone()
+
+grd_files = [
+    '$CHROME_SRC_DIR/chrome/browser/browser_resources.grd',
+    '$CHROME_SRC_DIR/chrome/browser/debugger/resources/debugger_resources.grd',
+    '$CHROME_SRC_DIR/chrome/common/common_resources.grd',
+    '$CHROME_SRC_DIR/chrome/renderer/renderer_resources.grd',
+]
+
+for grd_file in grd_files:
+  # The fake target gets replaced with real targets when the GRIT Builder
+  # runs.
+  generated = env.GRIT(
+      '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file),
+      grd_file)
+
+if env.Bit('linux'):
+  chrome_pak = env.Repack('$TARGET_ROOT/chrome.pak',
+      ['$TARGET_ROOT/grit_derived_sources/browser_resources.pak',
+       '$TARGET_ROOT/grit_derived_sources/debugger_resources.pak',
+       '$TARGET_ROOT/grit_derived_sources/common_resources.pak',
+       '$TARGET_ROOT/grit_derived_sources/renderer_resources.pak',
+      ]
+  )
+  i = env.Install('$DESTINATION_ROOT', chrome_pak)
+  env.Requires('$DESTINATION_ROOT/chrome', i)
diff --git a/chrome/app/chrome_strings.scons b/chrome/app/chrome_strings.scons
new file mode 100644
index 0000000..580565f
--- /dev/null
+++ b/chrome/app/chrome_strings.scons
@@ -0,0 +1,22 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+
+Import('env')
+
+env = env.Clone()
+
+grd_files = [
+    '$CHROME_SRC_DIR/chrome/app/generated_resources.grd',
+    '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd',
+    '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd',
+]
+
+for grd_file in grd_files:
+  # The fake target gets replaced with real targets when the GRIT Builder
+  # runs.
+  generated = env.GRIT(
+      '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file),
+      grd_file)
diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript
index c3f1391..bddca68 100644
--- a/chrome/app/resources/SConscript
+++ b/chrome/app/resources/SConscript
@@ -153,7 +153,7 @@ locale_GUIDMap = {
 
 gcs_rc = '$TARGET_ROOT/grit_derived_sources/google_chrome_strings_%s.rc'
 cs_rc = '$TARGET_ROOT/grit_derived_sources/chromium_strings_%s.rc'
-gr_res = '$TARGET_ROOT/grit_derived_sources/generated_resources_%s.res'
+gr_rc = '$TARGET_ROOT/grit_derived_sources/generated_resources_%s.rc'
 ws_res = '$TARGET_ROOT/grit_derived_sources/webkit_strings_%s.res'
 
 dest_vcproj = '$CHROME_SRC_DIR/chrome/app/locales/%s.vcproj'
@@ -162,6 +162,7 @@ locale_dlls = []
 
 for locale in locale_list:
   res = env_res.RES('locale_settings_%s.rc' % locale)
+  gr_res = env_res.RES(gr_rc % locale)
 
   # TODO(sgk):  find out why this implicit dependency isn't discovered
   env.Depends(res, gcs_rc % locale)
diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript
deleted file mode 100644
index 34ebf75..0000000
--- a/chrome/app/theme/SConscript
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-Import('env', 'env_res')
-
-env = env.Clone()
-env_res = env_res.Clone()
-
-env_res.Append(
-    CPPPATH = [
-        '.',
-        '$CHROME_SRC_DIR',
-    ],
-)
-
-if env.Bit('windows'):
-  env_res.Append(
-      RCFLAGS = [
-          ['/l', '0x409'],
-      ],
-  )
-
-  env.Append(
-      LINKFLAGS = [
-          '/INCREMENTAL:NO',
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-
-          '/NOENTRY',
-          '/BASE:"0x3CE00000"',
-          '/MACHINE:X86',
-          '/FIXED:No',
-
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
-  )
-
-# TODO(tc): We need to pass in a preprocessor define for official builds.
-generated = env.GRIT(
-    '$TARGET_ROOT/grit_derived_sources/fake_theme_target',
-    '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd')
-
-if env.Bit('windows'):
-  input_files = ChromeFileList([
-      '$TARGET_ROOT/grit_derived_sources/theme_resources.rc',
-  ])
-
-  # TODO(tc): This causes scons to die because the regular expression that
-  # scans .rc files for dependencies overflows (see
-  # SCons/Tool/Scanner/RC.py).  Disable it for now because it's only for the
-  # Windows build.
-  #res = env.RES('$TARGET_ROOT/grit_derived_sources/theme_resources.rc')
-
-  #themes_default = env.ChromeSharedLibrary("default", res)
-  #env.Install("$DESTINATION_ROOT/themes", themes_default)
-
-  p = env.ChromeMSVSProject('theme_dll.vcproj',
-                            dest=('$CHROME_SRC_DIR/chrome/'
-                                  + 'app/theme/theme_dll.vcproj'),
-                            guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}',
-                            keyword='Win32Proj',
-                            # TODO(sgk):  when we can intuit the hierarchy
-                            # from the built targets.
-                            #buildtargets=TODO,
-                            files=input_files,
-                            tools=[
-                                'VCPreBuildEventTool',
-                                'VCCustomBuildTool',
-                                'VCXMLDataGeneratorTool',
-                                'VCWebServiceProxyGeneratorTool',
-                                'VCMIDLTool',
-                                'VCCLCompilerTool',
-                                'VCManagedResourceCompilerTool',
-                                'VCResourceCompilerTool',
-                                'VCPreLinkEventTool',
-                                'VCLinkerTool',
-                                'VCALinkTool',
-                                'VCManifestTool',
-                                'VCXDCMakeTool',
-                                'VCBscMakeTool',
-                                'VCFxCopTool',
-                                'VCAppVerifierTool',
-                                'VCWebDeploymentTool',
-                                'VCPostBuildEventTool',
-                            ],
-                            ConfigurationType='2')
-
-
-  p.AddConfig('Debug|Win32',
-              InheritedPropertySheets=[
-                  '$(SolutionDir)../build/debug.vsprops',
-                  './theme_dll.vsprops',
-              ])
-
-  p.AddConfig('Release|Win32',
-              InheritedPropertySheets=[
-                  '$(SolutionDir)../build/release.vsprops',
-                  './theme_dll.vsprops',
-              ])
diff --git a/chrome/app/theme/theme_dll.scons b/chrome/app/theme/theme_dll.scons
new file mode 100644
index 0000000..d99f9ee
--- /dev/null
+++ b/chrome/app/theme/theme_dll.scons
@@ -0,0 +1,19 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+Import('env')
+
+env = env.Clone()
+
+# The fake target gets replaced with real targets when the GRIT Builder runs.
+generated = env.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_theme_resources.grd',
+    '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd')
+
+if env.Bit('linux'):
+  theme_default_pak = env.Repack('$TARGET_ROOT/themes/default.pak',
+      ['$TARGET_ROOT/grit_derived_sources/theme_resources.pak']
+  )
+  i = env.Install('$DESTINATION_ROOT/themes/', theme_default_pak)
+  env.Requires('$DESTINATION_ROOT/chrome', i)
diff --git a/chrome/chrome.scons b/chrome/chrome.scons
index c78e095..75e3090 100644
--- a/chrome/chrome.scons
+++ b/chrome/chrome.scons
@@ -46,11 +46,18 @@ sconscript_files = env.ChromiumLoadComponentSConscripts(
     LOAD_NAMES = ['chrome'],
 
     chrome_sln          = 'chrome_sln.scons',
+
     locales             = 'app/locales/locales.scons',
+    chrome_resources    = 'app/chrome_resources.scons',
+    chrome_strings      = 'app/chrome_strings.scons',
+    theme_dll           = 'app/theme/theme_dll.scons',
+
     browser             = 'browser/browser.scons',
     debugger            = 'browser/debugger/debugger.scons',
+
     common              = 'common/common.scons',
     ipc_tests           = 'common/ipc_tests.scons',
+
     #gcapi_dll           = 'installer/gcapi/gcapi_dll.scons',
     #gcapi_lib           = 'installer/gcapi/gcapi_lib.scons',
     #gcapi_test          = 'installer/gcapi/gcapi_test.scons',
@@ -59,8 +66,11 @@ sconscript_files = env.ChromiumLoadComponentSConscripts(
     #installer_unittests = 'installer/util/installer_unittests.scons',
     util                = 'installer/util/util.scons',
     installer_unittests = 'installer/util/installer_unittests.scons',
+
     plugin              = 'plugin/plugin.scons',
+
     renderer            = 'renderer/renderer.scons',
+
     activex_test_controls = 
 			'test/activex_test_control/activex_test_control.scons',
     automated_ui_tests  = 'test/automated_ui_tests/automated_ui_tests.scons',
@@ -79,6 +89,7 @@ sconscript_files = env.ChromiumLoadComponentSConscripts(
     tab_switching_test  = 'test/tab_switching/tab_switching_test.scons',
     ui_tests            = 'test/ui/ui_tests.scons',
     unit_tests          = 'test/unit/unit_tests.scons',
+
     convert_dict        = 'tools/convert_dict/convert_dict.scons',
     crash_service       = 'tools/crash_service/crash_service.scons',
     flush_cache         = 'tools/perf/flush_cache/flush_cache.scons',