Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/mac/rules.gni") | |
| 6 import("//build/mac/tweak_info_plist.gni") | |
| 7 import("//build/util/branding.gni") | |
| 5 import("//testing/test.gni") | 8 import("//testing/test.gni") |
| 6 import("//build/config/mac/rules.gni") | |
| 7 | 9 |
| 8 source_set("mac_installer_base") { | 10 source_set("mac_installer_base") { |
| 9 visibility = [ ":*" ] | 11 visibility = [ ":*" ] |
| 10 sources = [ | 12 sources = [ |
| 11 "Downloader.h", | 13 "Downloader.h", |
| 12 "Downloader.m", | 14 "Downloader.m", |
| 13 "NSAlert+ChromeInstallerAdditions.h", | 15 "NSAlert+ChromeInstallerAdditions.h", |
| 14 "NSAlert+ChromeInstallerAdditions.m", | 16 "NSAlert+ChromeInstallerAdditions.m", |
| 15 "NSError+ChromeInstallerAdditions.h", | 17 "NSError+ChromeInstallerAdditions.h", |
| 16 "NSError+ChromeInstallerAdditions.m", | 18 "NSError+ChromeInstallerAdditions.m", |
| 17 "OmahaCommunication.h", | 19 "OmahaCommunication.h", |
| 18 "OmahaCommunication.m", | 20 "OmahaCommunication.m", |
| 19 "OmahaXMLParser.h", | 21 "OmahaXMLParser.h", |
| 20 "OmahaXMLParser.m", | 22 "OmahaXMLParser.m", |
| 21 "OmahaXMLRequest.h", | 23 "OmahaXMLRequest.h", |
| 22 "OmahaXMLRequest.m", | 24 "OmahaXMLRequest.m", |
| 23 "SystemInfo.h", | 25 "SystemInfo.h", |
| 24 "SystemInfo.m", | 26 "SystemInfo.m", |
| 25 "Unpacker.h", | 27 "Unpacker.h", |
| 26 "Unpacker.m", | 28 "Unpacker.m", |
| 27 ] | 29 ] |
| 28 public_configs = [ "//build/config/compiler:enable_arc" ] | 30 public_configs = [ "//build/config/compiler:enable_arc" ] |
| 29 } | 31 } |
| 30 | 32 |
| 33 tweak_info_plist("mac_installer_plist") { | |
| 34 info_plist = "Info.plist" | |
| 35 args = [ | |
| 36 "--breakpad=0", | |
| 37 "--keystone=0", | |
| 38 "--scm=1", | |
| 39 "--bundle_id=$chrome_mac_installer_bundle_id", | |
| 40 ] | |
| 41 } | |
|
Sidney San Martín
2016/09/21 21:18:39
Make sure these flags look OK — the only weird bit
Robert Sesek
2016/09/21 21:41:21
Yeah, I'd maybe skip the tweak step for the time b
Sidney San Martín
2016/09/21 23:19:20
Done.
| |
| 42 | |
| 31 mac_app_bundle("mac_installer_app") { | 43 mac_app_bundle("mac_installer_app") { |
| 32 info_plist = "Info.plist" | 44 output_name = "$chrome_product_installer_full_name" |
| 45 info_plist_target = ":mac_installer_plist" | |
| 33 extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.9" ] | 46 extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.9" ] |
|
Robert Sesek
2016/09/21 21:41:21
You still need to add PRODUCT_INSTALLER_FULLNAME a
Sidney San Martín
2016/09/21 23:19:20
Oof, thanks. I skimmed the output Info.plist for e
Robert Sesek
2016/09/22 14:46:56
When I looked at your binary, I considered the sam
Sidney San Martín
2016/09/22 15:43:48
Will do.
| |
| 34 sources = [ | 47 sources = [ |
| 35 "AppDelegate.h", | 48 "AppDelegate.h", |
| 36 "AppDelegate.mm", | 49 "AppDelegate.mm", |
| 37 "AuthorizedInstall.h", | 50 "AuthorizedInstall.h", |
| 38 "AuthorizedInstall.m", | 51 "AuthorizedInstall.m", |
| 39 "InstallerWindowController.h", | 52 "InstallerWindowController.h", |
| 40 "InstallerWindowController.m", | 53 "InstallerWindowController.m", |
| 41 "main.m", | 54 "main.m", |
| 42 ] | 55 ] |
| 43 | 56 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 "DiskArbitration.framework", | 101 "DiskArbitration.framework", |
| 89 "Security.framework", | 102 "Security.framework", |
| 90 ] | 103 ] |
| 91 data = [ | 104 data = [ |
| 92 "//chrome/test/data/mac_installer/requestCheck.dtd", | 105 "//chrome/test/data/mac_installer/requestCheck.dtd", |
| 93 "//chrome/test/data/mac_installer/requestSample.xml", | 106 "//chrome/test/data/mac_installer/requestSample.xml", |
| 94 "//chrome/test/data/mac_installer/responseExample.xml", | 107 "//chrome/test/data/mac_installer/responseExample.xml", |
| 95 "//chrome/test/data/mac_installer/test-dmg.dmg", | 108 "//chrome/test/data/mac_installer/test-dmg.dmg", |
| 96 ] | 109 ] |
| 97 } | 110 } |
| OLD | NEW |