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

mac: Use "Atom Framework.framework" instead of "Atom.framework".

Browse source 
The "Atom.framework" would confuse breakpad with "App.app" when finding
symbols.
This commit is contained in:
Cheng Zhao 2013-11-25 15:37:39 +08:00
parent b737e602b7
commit a5224f705d
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/atom_main_delegate_mac.mm
View file

@ -34,7 +34,7 @@ base::FilePath AtomMainDelegate::GetResourcesPakFilePath() {
void AtomMainDelegate::OverrideFrameworkBundlePath() { void AtomMainDelegate::OverrideFrameworkBundlePath() {
base::mac::SetOverrideFrameworkBundlePath( base::mac::SetOverrideFrameworkBundlePath(
GetFrameworksPath().Append("Atom.framework")); GetFrameworksPath().Append("Atom Framework.framework"));
} }
void AtomMainDelegate::OverrideChildProcessPath() { void AtomMainDelegate::OverrideChildProcessPath() {

13
atom.gyp
View file

@ -2,6 +2,7 @@
'variables': { 'variables': {
'project_name': 'atom', 'project_name': 'atom',
'product_name': 'Atom', 'product_name': 'Atom',
'framework_name': 'Atom Framework',
'app_sources': [ 'app_sources': [
'app/atom_main.cc', 'app/atom_main.cc',
'app/atom_main.h', 'app/atom_main.h',
@ -253,7 +254,7 @@
'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks', 'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks',
'files': [ 'files': [
'<(PRODUCT_DIR)/<(product_name) Helper.app', '<(PRODUCT_DIR)/<(product_name) Helper.app',
'<(PRODUCT_DIR)/<(product_name).framework', '<(PRODUCT_DIR)/<(framework_name).framework',
'frameworks/Sparkle.framework', 'frameworks/Sparkle.framework',
], ],
}, },
@ -435,7 +436,7 @@
'targets': [ 'targets': [
{ {
'target_name': '<(project_name)_framework', 'target_name': '<(project_name)_framework',
'product_name': '<(product_name)', 'product_name': '<(framework_name)',
'type': 'shared_library', 'type': 'shared_library',
'dependencies': [ 'dependencies': [
'<(project_name)_lib', '<(project_name)_lib',
@ -466,7 +467,7 @@
'LIBRARY_SEARCH_PATHS': [ 'LIBRARY_SEARCH_PATHS': [
'<(libchromiumcontent_library_dir)', '<(libchromiumcontent_library_dir)',
], ],
'LD_DYLIB_INSTALL_NAME': '@rpath/<(product_name).framework/<(product_name)', 'LD_DYLIB_INSTALL_NAME': '@rpath/<(framework_name).framework/<(framework_name)',
'LD_RUNPATH_SEARCH_PATHS': [ 'LD_RUNPATH_SEARCH_PATHS': [
'@loader_path/Libraries', '@loader_path/Libraries',
], ],
@ -476,14 +477,14 @@
}, },
'copies': [ 'copies': [
{ {
'destination': '<(PRODUCT_DIR)/<(product_name).framework/Versions/A/Libraries', 'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Libraries',
'files': [ 'files': [
'<(libchromiumcontent_library_dir)/ffmpegsumo.so', '<(libchromiumcontent_library_dir)/ffmpegsumo.so',
'<(libchromiumcontent_library_dir)/libchromiumcontent.dylib', '<(libchromiumcontent_library_dir)/libchromiumcontent.dylib',
], ],
}, },
{ {
'destination': '<(PRODUCT_DIR)/<(product_name).framework/Versions/A/Resources', 'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Resources',
'files': [ 'files': [
'<(PRODUCT_DIR)/Inspector', '<(PRODUCT_DIR)/Inspector',
'<(PRODUCT_DIR)/crash_report_sender.app', '<(PRODUCT_DIR)/crash_report_sender.app',
@ -501,7 +502,7 @@
'postbuild_name': 'Add symlinks for framework subdirectories', 'postbuild_name': 'Add symlinks for framework subdirectories',
'action': [ 'action': [
'tools/mac/create-framework-subdir-symlinks.sh', 'tools/mac/create-framework-subdir-symlinks.sh',
'<(product_name)', '<(framework_name)',
'Libraries', 'Libraries',
'Frameworks', 'Frameworks',
], ],

4
browser/atom_browser_main_parts_mac.mm
View file

@ -20,7 +20,9 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
[NSApp setDelegate:delegate]; [NSApp setDelegate:delegate];
base::FilePath frameworkPath = brightray::MainApplicationBundlePath() base::FilePath frameworkPath = brightray::MainApplicationBundlePath()
.Append("Contents").Append("Frameworks").Append("Atom.framework"); .Append("Contents")
.Append("Frameworks")
.Append("Atom Framework.framework");
NSBundle* frameworkBundle = [NSBundle NSBundle* frameworkBundle = [NSBundle
bundleWithPath:base::mac::FilePathToNSString(frameworkPath)]; bundleWithPath:base::mac::FilePathToNSString(frameworkPath)];
NSNib* mainNib = [[NSNib alloc] initWithNibNamed:@"MainMenu" NSNib* mainNib = [[NSNib alloc] initWithNibNamed:@"MainMenu"