diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 01:10:32 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 01:10:32 +0000 |
| commit | 6b6133ef3f71953e93cd9d0de553d6d03935537f (patch) | |
| tree | 6bc30c79f093393ec6ccef3382444be186f2ba25 /remoting | |
| parent | 810ffba3ed8a53fa627aa746285ec63a9d192f60 (diff) | |
| download | chromium_src-6b6133ef3f71953e93cd9d0de553d6d03935537f.zip chromium_src-6b6133ef3f71953e93cd9d0de553d6d03935537f.tar.gz chromium_src-6b6133ef3f71953e93cd9d0de553d6d03935537f.tar.bz2 | |
[Chromoting] Sign the prefpane and installer package.
Now that the Chromoting installer is built using Packages, we can build a "flat" installer and have it signed.
A signed installer is required for OS X 10.8 (Mt Lion).
This cl also signs the Chromoting prefpane.
Review URL: https://chromiumcodereview.appspot.com/10538092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/installer/mac/ChromotingHost.pkgproj | 2 | ||||
| -rwxr-xr-x | remoting/host/installer/mac/do_signing.sh | 22 |
2 files changed, 18 insertions, 6 deletions
diff --git a/remoting/host/installer/mac/ChromotingHost.pkgproj b/remoting/host/installer/mac/ChromotingHost.pkgproj index ee2cc20..0423dd8 100644 --- a/remoting/host/installer/mac/ChromotingHost.pkgproj +++ b/remoting/host/installer/mac/ChromotingHost.pkgproj @@ -697,7 +697,7 @@ </array> </dict> <key>BUILD_FORMAT</key> - <integer>1</integer> + <integer>0</integer> <key>BUILD_PATH</key> <dict> <key>PATH</key> diff --git a/remoting/host/installer/mac/do_signing.sh b/remoting/host/installer/mac/do_signing.sh index 7e16fb7..78782e1 100755 --- a/remoting/host/installer/mac/do_signing.sh +++ b/remoting/host/installer/mac/do_signing.sh @@ -28,6 +28,7 @@ declare -a g_cleanup_dirs # Binaries to sign. ME2ME_HOST='PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app' UNINSTALLER='Applications/@@HOST_UNINSTALLER_NAME@@.app' +PREFPANE='PreferencePanes/org.chromium.chromoting.prefPane' # The Chromoting Host installer is a meta-package that consists of 3 # components: @@ -38,14 +39,17 @@ if $USE_ICEBERG ; then PKGPROJ_HOST='ChromotingHost.packproj' PKGPROJ_HOST_SERVICE='ChromotingHostService.packproj' PKGPROJ_HOST_UNINSTALLER='ChromotingHostUninstaller.packproj' + + # Final (user-visible) mpkg name. + PKG_FINAL='@@HOST_PKG@@.mpkg' 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' + # Final (user-visible) pkg name. + PKG_FINAL='@@HOST_PKG@@.pkg' +fi DMG_VOLUME_NAME='@@DMG_VOLUME_NAME@@' DMG_FILE_NAME='@@DMG_FILE_NAME@@.dmg' @@ -115,6 +119,15 @@ sign_binaries() { sign "${input_dir}/${ME2ME_HOST}" "${keychain}" "${id}" sign "${input_dir}/${UNINSTALLER}" "${keychain}" "${id}" + sign "${input_dir}/${PREFPANE}" "${keychain}" "${id}" +} + +sign_installer() { + local input_dir="${1}" + local keychain="${2}" + local id="${3}" + + sign "${input_dir}/${PKG_DIR}/${PKG_FINAL}" "${keychain}" "${id}" } build_package() { @@ -174,8 +187,7 @@ main() { sign_binaries "${input_dir}" "${codesign_keychain}" "${codesign_id}" build_packages "${input_dir}" - # TODO(garykac): Sign final .mpkg once we've switched to Packages. - # (crbug.com/127267) + sign_installer "${input_dir}" "${codesign_keychain}" "${codesign_id}" build_dmg "${input_dir}" "${output_dir}" cleanup |