mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

mac: Disable auto updater in MAS build

Browse source
This commit is contained in:
Cheng Zhao 2015-09-28 15:02:36 +08:00
parent a9f5667899
commit b62e3554dc
2 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
atom.gyp
View file

@ -64,9 +64,6 @@
'files': [ 'files': [
'<(PRODUCT_DIR)/<(product_name) Helper.app', '<(PRODUCT_DIR)/<(product_name) Helper.app',
'<(PRODUCT_DIR)/<(product_name) Framework.framework', '<(PRODUCT_DIR)/<(product_name) Framework.framework',
'external_binaries/Squirrel.framework',
'external_binaries/ReactiveCocoa.framework',
'external_binaries/Mantle.framework',
], ],
}, },
{ {
@ -109,7 +106,21 @@
'<@(locale_dirs)', '<@(locale_dirs)',
], ],
}, },
] ],
'conditions': [
['mas_build==0', {
'copies': [
{
'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks',
'files': [
'external_binaries/Squirrel.framework',
'external_binaries/ReactiveCocoa.framework',
'external_binaries/Mantle.framework',
],
},
],
}],
],
}, { # OS=="mac" }, { # OS=="mac"
'dependencies': [ 'dependencies': [
'make_locale_paks', 'make_locale_paks',
@ -296,6 +307,7 @@
'MAS_BUILD', 'MAS_BUILD',
], ],
'sources!': [ 'sources!': [
'atom/browser/auto_updater_mac.mm',
'atom/common/crash_reporter/crash_reporter_mac.h', 'atom/common/crash_reporter/crash_reporter_mac.h',
'atom/common/crash_reporter/crash_reporter_mac.mm', 'atom/common/crash_reporter/crash_reporter_mac.mm',
], ],
@ -402,9 +414,6 @@
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework', '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
'external_binaries/Squirrel.framework',
'external_binaries/ReactiveCocoa.framework',
'external_binaries/Mantle.framework',
], ],
}, },
'mac_bundle': 1, 'mac_bundle': 1,
@ -481,6 +490,13 @@
], ],
'conditions': [ 'conditions': [
['mas_build==0', { ['mas_build==0', {
'link_settings': {
'libraries': [
'external_binaries/Squirrel.framework',
'external_binaries/ReactiveCocoa.framework',
'external_binaries/Mantle.framework',
],
},
'copies': [ 'copies': [
{ {
'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Resources', 'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Resources',

8
atom/browser/auto_updater.cc
View file

@ -16,4 +16,12 @@ void AutoUpdater::SetDelegate(AutoUpdaterDelegate* delegate) {
delegate_ = delegate; delegate_ = delegate;
} }
#if defined(OS_MACOSX) && defined(MAS_BUILD)
void AutoUpdater::SetFeedURL(const std::string& url) {
}
void AutoUpdater::CheckForUpdates() {
}
#endif
} // namespace auto_updater } // namespace auto_updater