Move the entire application into a dylib (framework)

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,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 2698 matching lines @@
         'app/chrome_exe_main.cc',
         'app/chrome_exe_main.mm',
         'app/chrome_exe_main_gtk.cc',
         'app/chrome_exe_resource.h',
         'app/client_util.cc',
         'app/client_util.h',
         'app/google_update_client.cc',
         'app/google_update_client.h',
         'app/hard_error_handler_win.cc',
         'app/hard_error_handler_win.h',
-        'app/keystone_glue.h',
-        'app/keystone_glue.m',
         'app/scoped_ole_initializer.h',
       ],
       'dependencies': [
         '../build/util/support/support.gyp:*',
       ],
       'mac_bundle_resources': [
         # put any pdfs down in the sources block below so pdfsqueeze runs on
         # them.
         'app/nibs/About.xib',
         'app/nibs/BookmarkBar.xib',
@@ skipping 112 matching lines @@
                     '<(PRODUCT_DIR)/chrome.breakpad',
                   ],
                   'action': ['<(DEPTH)/build/linux/dump_app_syms',
                              '<(PRODUCT_DIR)/dump_syms',
                              '<(PRODUCT_DIR)/chrome', '<@(_outputs)'],
                 },
               ],
             }],
           ],
           'dependencies': [
+            # On Linux, link the dependencies (libraries) that make up actual
+            # Chromium functionality directly into the executable.
+            '<@(chromium_dependencies)',
             # Needed for chrome_dll_main.cc #include of gtk/gtk.h
             '../build/linux/system.gyp:gtk',
             # Needed for chrome_dll_main.cc use of g_thread_init
             '../build/linux/system.gyp:gthread',
           ],
+          'sources': [
+            'app/chrome_dll_main.cc',
+            'app/chrome_dll_resource.h',
+          ],
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
               'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak',
                         'tools/build/linux/chrome-wrapper',
                         '../third_party/xdg-utils/scripts/xdg-settings',
                         ],
               # The wrapper script above may need to generate a .desktop file,
               # which requires an icon. So, copy one next to the script.
               'conditions': [
@@ skipping 52 matching lines @@
                             '../third_party/ffmpeg/binaries/chromium/libavformat.52.dylib',
                             '../third_party/ffmpeg/binaries/chromium/libavutil.50.dylib'],
                 },
               ],
             }],
             ['mac_breakpad==1', {
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
                 'mac_real_dsym': 1,
               },
-              'sources': [
-                'app/breakpad_mac.mm',
-                'app/breakpad_mac.h',
-              ],
               'dependencies': [
-                '../breakpad/breakpad.gyp:breakpad',
                 '../breakpad/breakpad.gyp:dump_syms',
                 '../breakpad/breakpad.gyp:symupload',
               ],
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Resources/',
                   'files': ['<(PRODUCT_DIR)/crash_inspector', '<(PRODUCT_DIR)/crash_report_sender.app'],
                 },
               ],
               'postbuilds': [
                 {
                   'postbuild_name': 'Dump Symbols',
                   'action': ['<(DEPTH)/build/mac/dump_app_syms',
                              '<(branding)'],
                 },
               ],
-            }, {
-              # no breakpad, put in the stubs
-              'sources': [
-                'app/breakpad_mac_stubs.mm',
-                'app/breakpad_mac.h',
-              ],
             }],  # mac_breakpad
             ['mac_keystone==1', {
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Frameworks/',
                   'files': ['../third_party/googlemac/Releases/Keystone/KeystoneRegistration.framework'],
                 },
               ],
             }],  # mac_keystone
           ],
@@ skipping 18 matching lines @@
               'inputs': [
                 '<(PRODUCT_DIR)/pdfsqueeze',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/pdfsqueeze/<(RULE_INPUT_ROOT).pdf',
               ],
               'action': ['<(PRODUCT_DIR)/pdfsqueeze', '<(RULE_INPUT_PATH)', '<@(_outputs)'],
               'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)',
             },
           ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Frameworks',
+              'files': ['<(PRODUCT_DIR)/<(mac_product_name) Framework.framework'],
+            },
+          ],
         }, { # 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".
               # NOTE: chrome/app/theme/chromium/BRANDING and
               # chrome/app/theme/google_chrome/BRANDING have the short names,
               # etc.; should we try to extract from there instead?
               'product_name': 'chrome'
             }],
           ],
         }],
         ['OS=="mac"', {
           'actions': [
             {
-              # Mac addes an action to modify the Info.plist to meet our needs
+              # Mac adds an action to modify the Info.plist to meet our needs
               # (see the script for why this is done).
               'action_name': 'tweak_app_infoplist',
               # We don't list any inputs or outputs because we always want
               # the script to run.  Why?  Because it does thinks like record
               # the svn revision into the info.plist, so there is no file to
               # depend on that will change when ever that changes.
               'inputs': [],
               'outputs': [],
               'action': ['<(DEPTH)/build/mac/tweak_app_infoplist',
                          '-b<(mac_breakpad)',
@@ skipping 13 matching lines @@
         }],
         ['OS=="linux"', {
           'conditions': [
             ['branding=="Chrome"', {
               'dependencies': [
                 'installer/installer.gyp:installer_util',
               ],
             }],
           ],
         }],
+        ['OS=="mac" or OS=="win"', {
+          'dependencies': [
+            # On Windows and Mac, make sure we've built chrome_dll, which
+            # contains all of the library code with Chromium functionality.
+            'chrome_dll',
+          ],
+        }],
         ['OS=="win"', {
           'dependencies': [
-            # On Windows, make sure we've built chrome.dll, which
-            # contains all of the library code with Chromium
-            # functionality.
-            'chrome_dll',
             'installer/installer.gyp:installer_util',
             'installer/installer.gyp:installer_util_strings',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
             '../sandbox/sandbox.gyp:sandbox',
             '../views/views.gyp:views',
             'worker',
             'app/locales/locales.gyp:*',
           ],
           'sources': [
@@ skipping 64 matching lines @@
               'inputs': [
                   'app/FirstRun',
               ],
               'outputs': [
                   '<(PRODUCT_DIR)/First Run',
               ],
               'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'],
               'message': 'Copy first run complete sentinel file',
             },
           ],
-        },{  # 'OS!="win"
-          'dependencies': [
-            # On Linux and Mac, link the dependencies (libraries)
-            # that make up actual Chromium functionality directly
-            # into the executable.
-            '<@(chromium_dependencies)',
-          ],
-          'sources': [
-            'app/chrome_dll_main.cc',
-            'app/chrome_dll_resource.h',
-          ],
+        }, {  # 'OS!="win"
           'variables': {
             'repack_path': '../tools/data_pack/repack.py',
           },
           'actions': [
             {
               'action_name': 'repack_chrome',
               'variables': {
                 'pak_inputs': [
                   '<(grit_out_dir)/browser_resources.pak',
                   '<(grit_out_dir)/common_resources.pak',
@@ skipping 1104 matching lines @@
             'Debug': {
               'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
               'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
             },
           },
         }], # OS="win"
       ], # conditions
     },
   ],
   'conditions': [
-    ['OS=="mac"', {
-      'conditions': [
-        # We need the Mac app name on disk, so we stick this into a variable so
-        # the different places that need it can use the common variable.
-        # NOTE: chrome/app/theme/chromium/BRANDING and
-        # chrome/app/theme/google_chrome/BRANDING have the short names, etc.;
-        # but extracting from there still means xcodeproject are out of date until
-        # the next project regeneration.
-        ['branding=="Chrome"', {
-          'variables': {
-            'mac_product_name%': 'Google Chrome',
-          }
-        }, {
-          'variables': {
-            'mac_product_name%': 'Chromium',
-          }
-        }],
-        # We set feature variables so the different parts of the gyp file use
-        # these vars in conditions instead of repeating the check of branding
-        # and buildtype.
-        ['branding=="Chrome" and buildtype=="Official"', {
-          'variables': {
-            'mac_breakpad%': 1,
-            'mac_keystone%': 1,
-          }
-        }, {
-          'variables': {
-            'mac_breakpad%': 0,
-            'mac_keystone%': 0,
-          }
-        }],
-      ],
-    }],
+    ['OS=="mac" or OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'chrome_dll',
+          'type': 'shared_library',
+          'dependencies': [
+            '<@(chromium_dependencies)',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'product_name': 'chrome',
+              'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9',
+              'include_dirs': [
+                'third_party/wtl/include',
+              ],
+              'dependencies': [
+                # On Windows, link the dependencies (libraries) that make
+                # up actual Chromium functionality into this .dll.
+                'chrome_dll_version',
+                'chrome_resources',
+                'installer/installer.gyp:installer_util_strings',
+                'theme_dll',
+                'worker',
+                '../printing/printing.gyp:printing',
+                '../net/net.gyp:net_resources',
+                '../build/util/support/support.gyp:*',
+                '../third_party/cld/cld.gyp:cld',
+                '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                '../views/views.gyp:views',
+                '../webkit/webkit.gyp:webkit_resources',
+                '../gears/gears.gyp:gears',
+              ],
+              'defines': [
+                'CHROME_DLL',
+                'BROWSER_DLL',
+                'RENDERER_DLL',
+                'PLUGIN_DLL',
+              ],
+              'sources': [
+                'app/chrome_dll.rc',
+                'app/chrome_dll_main.cc',
+                'app/chrome_dll_resource.h',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+
+                '../webkit/glue/resources/aliasb.cur',
+                '../webkit/glue/resources/cell.cur',
+                '../webkit/glue/resources/col_resize.cur',
+                '../webkit/glue/resources/copy.cur',
+                '../webkit/glue/resources/row_resize.cur',
+                '../webkit/glue/resources/vertical_text.cur',
+                '../webkit/glue/resources/zoom_in.cur',
+                '../webkit/glue/resources/zoom_out.cur',
+
+                # TODO:  It would be nice to have these pulled in
+                # automatically from direct_dependent_settings in
+                # their various targets (net.gyp:net_resources, etc.),
+                # but that causes errors in other targets when
+                # resulting .res files get referenced multiple times.
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
+
+                # TODO(sgk):  left-over from pre-gyp build, figure out
+                # if we still need them and/or how to update to gyp.
+                #'app/check_dependents.bat',
+                #'app/chrome.dll.deps',
+              ],
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'BaseAddress': '0x01c30000',
+                  'DelayLoadDLLs': [
+                    'crypt32.dll',
+                    'cryptui.dll',
+                    'winhttp.dll',
+                    'wininet.dll',
+                    'wsock32.dll',
+                    'ws2_32.dll',
+                    'winspool.drv',
+                    'comdlg32.dll',
+                    'imagehlp.dll',
+                    'psapi.dll',
+                    'urlmon.dll',
+                    'imm32.dll',
+                  ],
+                  'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
+                  'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
+                  # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
+                  'SubSystem': '2',
+                },
+                'VCManifestTool': {
+                  'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
+                },
+              },
+              'configurations': {
+                'Debug': {
+                  'msvs_settings': {
+                    'VCLinkerTool': {
+                      'LinkIncremental': '1',       # /INCREMENTAL:NO
+                    },
+                  },
+                },
+              },
+            }],  # OS=="win"
+            ['OS=="mac"', {
+              # The main browser executable's name is <(mac_product_name).
+              # Certain things will get confused if two modules in the
+              # executable share the same name, so append " Framework" to the
+              # product_name used for the framework.  This will result in
+              # a name like "Chromium Framework.framework".
+              'product_name': '<(mac_product_name) Framework',
+              'mac_bundle': 1,
+              'xcode_settings': {
+                'DYLIB_INSTALL_NAME_BASE': '@executable_path/../Frameworks',
+              },
+              'sources': [
+                'app/chrome_dll_main.cc',
+                'app/chrome_dll_resource.h',
+                'app/chrome_exe_main.mm',
+                'app/keystone_glue.h',
+                'app/keystone_glue.m',
+              ],
+              'dependencies': [
+                '../build/util/support/support.gyp:*',
+              ],
+
+              # For now, don't put any resources into the framework.  Exclude
+              # them all and push them into the bundle resources of the sole
+              # app bundle, the only dependent of this target.
+              # TODO(mark): Fix.
+              'mac_bundle_resources/': [
+                ['exclude', ''],
+              ],
+              'direct_dependent_settings': {
+                'mac_bundle_resources': [
+                  '../third_party/WebKit/WebCore/Resources/aliasCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/cellCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/contextMenuCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/copyCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/crossHairCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/eastResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/eastWestResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/helpCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/linkCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/missingImage.png',
+                  '../third_party/WebKit/WebCore/Resources/moveCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/noDropCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/noneCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/northEastResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/northEastSouthWestResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/northResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/northWestResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/northWestSouthEastResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/notAllowedCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/progressCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/southEastResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/southResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/southWestResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/verticalTextCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/waitCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/westResizeCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/zoomInCursor.png',
+                  '../third_party/WebKit/WebCore/Resources/zoomOutCursor.png',
+                  'renderer/renderer.sb',
+                ],
+              },
+
+              'conditions': [
+                ['mac_breakpad==1', {
+                  'variables': {
+                    # A real .dSYM is needed for dump_syms to operate on.
+                    'mac_real_dsym': 1,
+                  },
+                  'sources': [
+                    'app/breakpad_mac.mm',
+                    'app/breakpad_mac.h',
+                  ],
+                  'dependencies': [
+                    '../breakpad/breakpad.gyp:breakpad',
+                  ],
+                }, {  # else: mac_breakpad!=1
+                  # No Breakpad, put in the stubs.
+                  'sources': [
+                    'app/breakpad_mac_stubs.mm',
+                    'app/breakpad_mac.h',
+                  ],
+                }],  # mac_breakpad
+              ],  # conditions
+            }],  # OS=="mac"
+          ],  # conditions
+        },  # target chrome_dll
+      ],  # targets
+    }],  # OS=="mac" or OS=="win"
     ['OS=="linux"', {
       'conditions': [
         # Only Chrome builds get breakpad since crash processing is internal.
         ['branding=="Chrome"', {
           'variables': {
             'linux_breakpad%': 1,
           },
         }, {
           'variables': {
             'linux_breakpad%': 0,
           },
         }],
       ],
     }],
     ['OS=="mac"',
-      # On Mac only, add a project target called "build_app_dmg" that only
-      # builds a DMG out of the App (eventually will completely replace
-      # "package_app").
       { 'targets': [
         {
+          # Convenience target to build a disk image.
           'target_name': 'build_app_dmg',
-          # do NOT place this in the 'all' list; most won't want it.
-          # In gyp, booleans are 0/1 not True/False.
+          # Don't place this in the 'all' list; most won't want it.
+          # In GYP, booleans are 0/1, not True/False.
           'suppress_wildcard': 1,
           'type': 'none',
           'dependencies': [
             'chrome',
           ],
           'variables': {
             'build_app_dmg_script_path': '<(DEPTH)/build/mac/build_app_dmg',
           },
           'actions': [
             {
@@ skipping 231 matching lines @@
             '../gears/gears.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
             '../webkit/activex_shim/activex_shim.gyp:*',
             '../webkit/activex_shim_dll/activex_shim_dll.gyp:*',
             '../v8/tools/gyp/v8.gyp:v8_shell',
           ],
         },
         {
-          'target_name': 'chrome_dll',
-          'type': 'shared_library',
-          'product_name': 'chrome',
-          'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9',
-          'include_dirs': [
-            'third_party/wtl/include',
-          ],
-          'dependencies': [
-            # On Windows, link the dependencies (libraries) that make
-            # up actual Chromium functionality into this .dll.
-            '<@(chromium_dependencies)',
-            'chrome_dll_version',
-            'chrome_resources',
-            'installer/installer.gyp:installer_util_strings',
-            'theme_dll',
-            'worker',
-            '../printing/printing.gyp:printing',
-            '../net/net.gyp:net_resources',
-            '../build/util/support/support.gyp:*',
-            '../third_party/cld/cld.gyp:cld',
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
-            '../views/views.gyp:views',
-            '../webkit/webkit.gyp:webkit_resources',
-            '../gears/gears.gyp:gears',
-          ],
-          'defines': [
-            'CHROME_DLL',
-            'BROWSER_DLL',
-            'RENDERER_DLL',
-            'PLUGIN_DLL',
-          ],
-          'sources': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_main.cc',
-            'app/chrome_dll_resource.h',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
-
-            '../webkit/glue/resources/aliasb.cur',
-            '../webkit/glue/resources/cell.cur',
-            '../webkit/glue/resources/col_resize.cur',
-            '../webkit/glue/resources/copy.cur',
-            '../webkit/glue/resources/row_resize.cur',
-            '../webkit/glue/resources/vertical_text.cur',
-            '../webkit/glue/resources/zoom_in.cur',
-            '../webkit/glue/resources/zoom_out.cur',
-
-            # TODO:  It would be nice to have these pulled in
-            # automatically from direct_dependent_settings in
-            # their various targets (net.gyp:net_resources, etc.),
-            # but that causes errors in other targets when
-            # resulting .res files get referenced multiple times.
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
-
-            # TODO(sgk):  left-over from pre-gyp build, figure out
-            # if we still need them and/or how to update to gyp.
-            #'app/check_dependents.bat',
-            #'app/chrome.dll.deps',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'BaseAddress': '0x01c30000',
-              'DelayLoadDLLs': [
-                'crypt32.dll',
-                'cryptui.dll',
-                'winhttp.dll',
-                'wininet.dll',
-                'wsock32.dll',
-                'ws2_32.dll',
-                'winspool.drv',
-                'comdlg32.dll',
-                'imagehlp.dll',
-                'psapi.dll',
-                'urlmon.dll',
-                'imm32.dll',
-              ],
-              'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
-              'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
-              # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
-              'SubSystem': '2',
-            },
-            'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
-            },
-          },
-          'configurations': {
-            'Debug': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '1',       # /INCREMENTAL:NO
-                },
-              },
-            },
-          },
-        },
-        {
           'target_name': 'chrome_dll_version',
           'type': 'none',
           #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
           'dependencies': [
             '../build/util/build_util.gyp:lastchange',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
             ],
@@ skipping 525 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }