Adding a secondary mini_installer target for Chrome Frame. This will remove the need to have different build scripts to build either Chrome or Chrome Frame.

Also remove the now-unneeded gyp variables 'chrome_frame_define' and 'google_update_appid'.

BUG=Both Chrome and Chrome Frame products should be buildable from a single solution file - we shouldn't need to run GYP with different settings to get a CF solution.
TEST=none


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

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

6 files changed, 80 insertions, 6 deletions

diff --git a/chrome/installer/mini_installer/appid.h b/chrome/installer/mini_installer/appid.h
new file mode 100644
index 0000000..552c5e6
--- /dev/null
+++ b/chrome/installer/mini_installer/appid.h
@@ -0,0 +1,13 @@
+// Copyright (c) 2010 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.
+
+#ifndef CHROME_INSTALLER_MINI_INSTALLER_APPID_H_
+#define CHROME_INSTALLER_MINI_INSTALLER_APPID_H_
+
+// The appid included by the mini_installer.
+namespace google_update {
+extern const wchar_t kAppGuid[];
+}
+
+#endif  // CHROME_INSTALLER_MINI_INSTALLER_APPID_H_
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 8237c65..1a46d06 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -38,8 +38,6 @@ Themes\default.dll: %(VersionDir)s\Themes
 locales\*.dll: %(VersionDir)s\Locales
 Resources\Inspector\*.*: %(VersionDir)s\Resources\Inspector
 Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images
-servers\*.dll: %(VersionDir)s\
-servers\*.exe: %(VersionDir)s\
 Extensions\*.*: %(VersionDir)s\Extensions\
 av*.dll: %(VersionDir)s\
 
diff --git a/chrome/installer/mini_installer/chrome_appid.cc b/chrome/installer/mini_installer/chrome_appid.cc
new file mode 100644
index 0000000..799aad1
--- /dev/null
+++ b/chrome/installer/mini_installer/chrome_appid.cc
@@ -0,0 +1,9 @@
+// Copyright (c) 2010 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.
+
+#include "chrome/installer/mini_installer/appid.h"
+
+namespace google_update {
+const wchar_t kAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
+}
diff --git a/chrome/installer/mini_installer/chrome_frame.release b/chrome/installer/mini_installer/chrome_frame.release
new file mode 100644
index 0000000..8237c65
--- /dev/null
+++ b/chrome/installer/mini_installer/chrome_frame.release
@@ -0,0 +1,47 @@
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[GENERAL]
+chrome.exe: %(ChromeDir)s\
+wow_helper.exe: %(ChromeDir)s\
+Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
+chrome.dll: %(VersionDir)s\
+icudt42.dll: %(VersionDir)s\
+gears.dll: %(VersionDir)s\
+Themes\default.dll: %(VersionDir)s\Themes
+locales\*.dll: %(VersionDir)s\Locales
+Resources\Inspector\*.*: %(VersionDir)s\Resources\Inspector
+Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images
+servers\*.dll: %(VersionDir)s\
+servers\*.exe: %(VersionDir)s\
+Extensions\*.*: %(VersionDir)s\Extensions\
+av*.dll: %(VersionDir)s\
+
+[GOOGLE_CHROME]
+rlz.dll: %(VersionDir)s\
diff --git a/chrome/installer/mini_installer/chrome_frame_appid.cc b/chrome/installer/mini_installer/chrome_frame_appid.cc
new file mode 100644
index 0000000..1462292
--- /dev/null
+++ b/chrome/installer/mini_installer/chrome_frame_appid.cc
@@ -0,0 +1,9 @@
+// Copyright (c) 2010 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.
+
+#include "chrome/installer/mini_installer/appid.h"
+
+namespace google_update {
+const wchar_t kAppGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
+}
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index 488afde..3bee0d6 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -32,12 +32,10 @@
 #include <Shellapi.h>
 #include <shlwapi.h>
 
+#include "chrome/installer/mini_installer/appid.h"
 #include "chrome/installer/mini_installer/mini_installer.h"
 #include "chrome/installer/mini_installer/pe_resource.h"
 
-// Generated header that includes the Google Update id.
-#include "appid.h"
-
 // Required linker symbol. See remarks above.
 extern "C" unsigned int __sse2_available = 0;
 
@@ -155,7 +153,7 @@ void SetFullInstallerFlag(HKEY root_key) {
   if (!SafeStrCopy(ap_registry_key, _countof(ap_registry_key),
                    kApRegistryKeyBase) ||
       !SafeStrCat(ap_registry_key, _countof(ap_registry_key),
-                  google_update::kChromeGuid)) {
+                  google_update::kAppGuid)) {
     return;
   }
   if (::RegOpenKeyEx(root_key, ap_registry_key, NULL,