[Chromoting] Add option for installer to be built using Packages.

This is currently disabled until we get an updated build of Keystone.

BUG=127267
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10458026

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

3 files changed, 27 insertions, 7 deletions

diff --git a/remoting/host/installer/build-installer-archive.py b/remoting/host/installer/build-installer-archive.py
index b321777..bd3d3a9 100755
--- a/remoting/host/installer/build-installer-archive.py
+++ b/remoting/host/installer/build-installer-archive.py
@@ -190,7 +190,7 @@ def buildHostArchive(temp_dir, zip_path, source_file_roots, source_files,
     (base, ext) = os.path.splitext(f)
     if ext == '.zip':
       copyZipIntoArchive(temp_dir, source_file_roots, f)
-    elif ext in ['.sh', '.packproj', '.plist']:
+    elif ext in ['.packproj', '.pkgproj', '.plist', '.sh']:
       copyFileWithDefs(f, dst_file, defs)
     else:
       shutil.copy2(f, dst_file)
diff --git a/remoting/host/installer/mac/do_signing.sh b/remoting/host/installer/mac/do_signing.sh
index 12e8a19..7d077af 100755
--- a/remoting/host/installer/mac/do_signing.sh
+++ b/remoting/host/installer/mac/do_signing.sh
@@ -17,6 +17,12 @@ set -e -u
 ME="$(basename "${0}")"
 readonly ME
 
+# Choose which installer package to use:
+# 'true' to use Iceberg, 'false' to use Packages.
+# TODO(garykac) Switch completely to Packages so we can sign for 10.8.
+# (crbug.com/127267)
+USE_ICEBERG=true
+
 declare -a g_cleanup_dirs
 
 # Binaries to sign.
@@ -27,10 +33,16 @@ UNINSTALLER='Applications/@@HOST_UNINSTALLER_NAME@@.app'
 # components:
 #  * Chromoting Host Service package
 #  * Chromoting Host Uninstaller package
-#  * Keystone package(GoogleSoftwareUpdate - for Official builds only)
-PKGPROJ_HOST='ChromotingHost.packproj'
-PKGPROJ_HOST_SERVICE='ChromotingHostService.packproj'
-PKGPROJ_HOST_UNINSTALLER='ChromotingHostUninstaller.packproj'
+#  * Keystone package (GoogleSoftwareUpdate - for Official builds only)
+if $USE_ICEBERG ; then
+  PKGPROJ_HOST='ChromotingHost.packproj'
+  PKGPROJ_HOST_SERVICE='ChromotingHostService.packproj'
+  PKGPROJ_HOST_UNINSTALLER='ChromotingHostUninstaller.packproj'
+else
+  PKGPROJ_HOST='ChromotingHost.pkgproj'
+  PKGPROJ_HOST_SERVICE='ChromotingHostService.pkgproj'
+  PKGPROJ_HOST_UNINSTALLER='ChromotingHostUninstaller.pkgproj'
+fi
 
 # Final (user-visible) mpkg name.
 PKG_FINAL='@@HOST_PKG@@.mpkg'
@@ -108,7 +120,11 @@ sign_binaries() {
 build_package() {
   local pkg="${1}"
   echo "Building .pkg from ${pkg}"
-  freeze "${pkg}"
+  if $USE_ICEBERG ; then
+    freeze "${pkg}"
+  else
+    packagesbuild -v "${pkg}"
+  fi
 }
 
 build_packages() {
@@ -158,7 +174,8 @@ main() {
 
   sign_binaries "${input_dir}" "${codesign_keychain}" "${codesign_id}"
   build_packages "${input_dir}"
-  # TODO(garykac): Sign final .mpkg.
+  # TODO(garykac): Sign final .mpkg once we've switched to Packages.
+  # (crbug.com/127267)
   build_dmg "${input_dir}" "${output_dir}"
 
   cleanup
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 277c120..29ce6f5 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -177,6 +177,9 @@
       'host/installer/mac/ChromotingHost.packproj',
       'host/installer/mac/ChromotingHostService.packproj',
       'host/installer/mac/ChromotingHostUninstaller.packproj',
+      'host/installer/mac/ChromotingHost.pkgproj',
+      'host/installer/mac/ChromotingHostService.pkgproj',
+      'host/installer/mac/ChromotingHostUninstaller.pkgproj',
       'host/installer/mac/LaunchAgents/org.chromium.chromoting.plist',
       'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh',
       'host/installer/mac/Scripts/keystone_install.sh',