Merge themes/default.pak into chrome.pak for Mac and Linux builds.

chrome/chrome.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 3503 matching lines @@
                   'files': ['app/theme/chromium/product_logo_48.png']
                 }],
               ],
             },
             {
               'destination': '<(PRODUCT_DIR)/locales',
               'files': [
                 '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
               ],
             },
-            {
-              'destination': '<(PRODUCT_DIR)/themes',
-              'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'],
-            },
           ],
         }],
         ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="mac"', {
           'variables': {
             'mac_packaging_dir':
@@ skipping 197 matching lines @@
               'postbuild_name': 'Make .lproj links',
               'action': ['<(symlink_lprojs_path)'],
             },
             {
               'postbuild_name': 'Clean up old versions',
               'action': [
                 'tools/build/mac/clean_up_old_versions',
                 '<(version_full)'
               ],
             },
+            {
+              # TODO(tony): Remove this after Nov 13, 2009.
+              'postbuild_name': 'cleanup_theme_pak',
+              'action': ['rm', '-f',
+                  '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Versions'
+                  '/<(version_full)/<(mac_product_name) Framework.framework/'
+                  'Resources/theme.pak'],
+            },
           ],  # postbuilds
         }, { # else: OS != "mac"
           'conditions': [
             ['branding=="Chrome"', {
               'product_name': 'chrome'
             }, {  # else: Branding!="Chrome"
               # TODO:  change to:
               #   'product_name': 'chromium'
               # whenever we convert the rest of the infrastructure
               # (buildbots etc.) to use "gyp -Dbranding=Chrome".
@@ skipping 121 matching lines @@
           'actions': [
             # TODO(mark): These actions are duplicated for the Mac in the
             # chrome_dll target.  Can they be unified?
             {
               'action_name': 'repack_chrome',
               'variables': {
                 'pak_inputs': [
                   '<(grit_out_dir)/browser_resources.pak',
                   '<(grit_out_dir)/common_resources.pak',
                   '<(grit_out_dir)/renderer_resources.pak',
+                  '<(grit_out_dir)/theme_resources.pak',

[Mark Mentovai, 2009/10/30 23:49:57]

TVL: Tony added theme_resources.pak and app_resources.pak here...

+                  '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
               ],
               'action': ['python', '<(repack_path)', '<@(_outputs)',
                          '<@(pak_inputs)'],
             },
             {
-              'action_name': 'repack_theme',

[Mark Mentovai, 2009/10/30 23:49:57]

...and got rid of them here.

-              'variables': {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
-                  '<(grit_out_dir)/theme_resources.pak',
-                ],
-              },
-              'inputs': [
-                '<(repack_path)',
-                '<@(pak_inputs)',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/repack/default.pak',
-              ],
-              'action': ['python', '<(repack_path)', '<@(_outputs)',
-                         '<@(pak_inputs)'],
-            },
-            {
               'action_name': 'repack_locales',
               'variables': {
                 'conditions': [
                   ['branding=="Chrome"', {
                     'branding_flag': ['-b', 'google_chrome',],
                   }, {  # else: branding!="Chrome"
                     'branding_flag': ['-b', 'chromium',],
                   }],
                 ],
               },
@@ skipping 1804 matching lines @@
                   'action': ['<(PRODUCT_DIR)/pdfsqueeze',
                              '<(RULE_INPUT_PATH)', '<@(_outputs)'],
                   'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)',
                 },
               ],
               'variables': {
                 'repack_path': '../tools/data_pack/repack.py',
               },
               'actions': [
                 # TODO(mark): These actions are duplicated for Linux and
-                # and FreeBSD in the chrome target.  Can they be unified?
+                # FreeBSD in the chrome target.  Can they be unified?
                 {
                   'action_name': 'repack_chrome',
                   'variables': {
                     'pak_inputs': [
                       '<(grit_out_dir)/browser_resources.pak',
                       '<(grit_out_dir)/common_resources.pak',
                       '<(grit_out_dir)/renderer_resources.pak',
+                      '<(grit_out_dir)/theme_resources.pak',
+                      '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
                       '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                       '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                     ],
                   },
                   'inputs': [
                     '<(repack_path)',
                     '<@(pak_inputs)',
                   ],
                   'outputs': [
                     '<(INTERMEDIATE_DIR)/repack/chrome.pak',
                   ],
                   'action': ['python', '<(repack_path)', '<@(_outputs)',
                              '<@(pak_inputs)'],
                   'process_outputs_as_mac_bundle_resources': 1,
                 },
                 {
-                  'action_name': 'repack_theme',
-                  'variables': {
-                    'pak_inputs': [
-                      '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
-                      '<(grit_out_dir)/theme_resources.pak',
-                    ],
-                  },
-                  'inputs': [
-                    '<(repack_path)',
-                    '<@(pak_inputs)',
-                  ],
-                  'outputs': [
-                    '<(INTERMEDIATE_DIR)/repack/theme.pak',
-                  ],
-                  'action': ['python', '<(repack_path)', '<@(_outputs)',
-                             '<@(pak_inputs)'],
-                  'process_outputs_as_mac_bundle_resources': 1,
-                },
-                {
                   'action_name': 'repack_locales',
                   'process_outputs_as_mac_bundle_resources': 1,
                   'variables': {
                     'conditions': [
                       ['branding=="Chrome"', {
                         'branding_flag': ['-b', 'google_chrome',],
                       }, {  # else: branding!="Chrome"
                         'branding_flag': ['-b', 'chromium',],
                       }],
                     ],
@@ skipping 1190 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: