[Mac] packaging process cleanup: Net of this is the zip off the official builder will have everything for packaging so the final signing/dmg creation is self contained instead of having to live in both places.

- Move all the installer related bits into the installer folder
- Add the collection of these bits into a specific target
- Collect the internal bits also during the installer target

BUG=42635
TEST=none
Review URL: http://codereview.chromium.org/2417007

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

6 files changed, 76 insertions, 53 deletions

diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index d2d02e4..bc6d4ca 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -215,15 +215,6 @@
           ],
         }],
         ['OS=="mac"', {
-          'variables': {
-            'mac_packaging_dir':
-                '<(PRODUCT_DIR)/<(mac_product_name) Packaging',
-            # <(PRODUCT_DIR) expands to $(BUILT_PRODUCTS_DIR), which doesn't
-            # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is
-            # needed.
-            'mac_packaging_sh_dir':
-                '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging',
-          },
           # 'branding' is a variable defined in common.gypi
           # (e.g. "Chromium", "Chrome")
           'conditions': [
@@ -275,50 +266,6 @@
                 }],
               ],
             }],  # mac_breakpad
-            ['mac_keystone==1', {
-              'copies': [
-                {
-                  # Put keystone_install.sh where the packaging system will
-                  # find it.  The packager will copy this script to the
-                  # correct location on the disk image.
-                  'destination': '<(mac_packaging_dir)',
-                  'files': [
-                    'tools/build/mac/keystone_install.sh',
-                  ],
-                },
-              ],
-            }],  # mac_keystone
-            ['buildtype=="Official"', {
-              'actions': [
-                {
-                  # Create sign.sh, the script that the packaging system will
-                  # use to sign the .app bundle.
-                  'action_name': 'Make sign.sh',
-                  'variables': {
-                    'make_sign_sh_path': 'tools/build/mac/make_sign_sh',
-                    'sign_sh_in_path': 'tools/build/mac/sign.sh.in',
-                    'app_resource_rules_in_path':
-                        'tools/build/mac/app_resource_rules.plist.in',
-                  },
-                  'inputs': [
-                    '<(make_sign_sh_path)',
-                    '<(sign_sh_in_path)',
-                    '<(app_resource_rules_in_path)',
-                    '<(version_path)',
-                  ],
-                  'outputs': [
-                    '<(mac_packaging_dir)/sign.sh',
-                    '<(mac_packaging_dir)/app_resource_rules.plist',
-                  ],
-                  'action': [
-                    '<(make_sign_sh_path)',
-                    '<(mac_packaging_sh_dir)',
-                    '<(mac_product_name)',
-                    '<(version_full)',
-                  ],
-                },
-              ],
-            }],  # buildtype=="Official"
           ],
           'product_name': '<(mac_product_name)',
           'xcode_settings': {
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index b56b300..8bd6030 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -752,6 +752,82 @@
         },
       ],
     }],
+    ['OS=="mac"', {
+      'variables': {
+        'mac_packaging_dir':
+            '<(PRODUCT_DIR)/<(mac_product_name) Packaging',
+        # <(PRODUCT_DIR) expands to $(BUILT_PRODUCTS_DIR), which doesn't
+        # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is
+        # needed.
+        'mac_packaging_sh_dir':
+            '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging',
+      }, # variables
+      'targets': [
+        {
+          'target_name': 'installer_packaging',
+          'type': 'none',
+          'conditions': [
+            ['buildtype=="Official"', {
+              'actions': [
+                {
+                  # Create sign.sh, the script that the packaging system will
+                  # use to sign the .app bundle.
+                  'action_name': 'Make sign.sh',
+                  'variables': {
+                    'make_sign_sh_path': 'installer/mac/make_sign_sh',
+                    'sign_sh_in_path': 'installer/mac/sign.sh.in',
+                    'app_resource_rules_in_path':
+                        'installer/mac/app_resource_rules.plist.in',
+                  },
+                  'inputs': [
+                    '<(make_sign_sh_path)',
+                    '<(sign_sh_in_path)',
+                    '<(app_resource_rules_in_path)',
+                    '<(version_path)',
+                  ],
+                  'outputs': [
+                    '<(mac_packaging_dir)/sign.sh',
+                    '<(mac_packaging_dir)/app_resource_rules.plist',
+                  ],
+                  'action': [
+                    '<(make_sign_sh_path)',
+                    '<(mac_packaging_sh_dir)',
+                    '<(mac_product_name)',
+                    '<(version_full)',
+                  ],
+                },
+              ],  # actions
+            }],  # buildtype=="Official"
+          ],  # conditions
+          'copies': [
+            {
+              # Put the files where the packaging system will find them.
+              # The packager will use these when building the disk image.
+              'destination': '<(mac_packaging_dir)',
+              'files': [
+                # Pull over the known version of pkg-dmg to use.
+                'tools/build/mac/pkg-dmg',
+              ],
+              'conditions': [
+                ['mac_keystone==1', {
+                  'files': [
+                    'installer/mac/keystone_install.sh',
+                  ],
+                }],  # mac_keystone
+                ['branding=="Chrome" and buildtype=="Official"', {
+                  'files': [
+                    'installer/mac/internal/chrome_dmg_background.png',
+                    'installer/mac/internal/chrome_dmg_dsstore',
+                    'installer/mac/internal/chrome_dmg_icon.icns',
+                    'installer/mac/internal/generate_dmgs',
+                  ],
+                }],  # branding=="Chrome" and buildtype=="Official"
+              ],  # conditions
+            },
+          ],  # copies
+        },  # target: installer_packaging
+      ],  # targets
+    }],  # OS=="mac"
     [ 'branding == "Chrome"', {
       'variables': {
          'branding_dir': 'app/theme/google_chrome',
diff --git a/chrome/tools/build/mac/app_resource_rules.plist.in b/chrome/installer/mac/app_resource_rules.plist.in
index d629044..d629044 100644
--- a/chrome/tools/build/mac/app_resource_rules.plist.in
+++ b/chrome/installer/mac/app_resource_rules.plist.in
diff --git a/chrome/tools/build/mac/keystone_install.sh b/chrome/installer/mac/keystone_install.sh
index 73f0920..73f0920 100755
--- a/chrome/tools/build/mac/keystone_install.sh
+++ b/chrome/installer/mac/keystone_install.sh
diff --git a/chrome/tools/build/mac/make_sign_sh b/chrome/installer/mac/make_sign_sh
index db6e1c2..db6e1c2 100755
--- a/chrome/tools/build/mac/make_sign_sh
+++ b/chrome/installer/mac/make_sign_sh
diff --git a/chrome/tools/build/mac/sign.sh.in b/chrome/installer/mac/sign.sh.in
index 18c8197..18c8197 100644
--- a/chrome/tools/build/mac/sign.sh.in
+++ b/chrome/installer/mac/sign.sh.in