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

Fix ICU inilialization bug.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-28 23:58:53 +08:00
parent cd4c5d976b
commit ad19381217
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom.gyp
View file

@ -313,6 +313,7 @@
}, },
'mac_bundle_resources': [ 'mac_bundle_resources': [
'<@(bundle_sources)', '<@(bundle_sources)',
'<(libchromiumcontent_resources_dir)/icudtl.dat',
], ],
'copies': [ 'copies': [
{ {
@ -377,7 +378,6 @@
'files': [ 'files': [
'<(libchromiumcontent_library_dir)/chromiumcontent.dll', '<(libchromiumcontent_library_dir)/chromiumcontent.dll',
'<(libchromiumcontent_library_dir)/ffmpegsumo.dll', '<(libchromiumcontent_library_dir)/ffmpegsumo.dll',
'<(libchromiumcontent_library_dir)/icudt.dll',
'<(libchromiumcontent_library_dir)/libEGL.dll', '<(libchromiumcontent_library_dir)/libEGL.dll',
'<(libchromiumcontent_library_dir)/libGLESv2.dll', '<(libchromiumcontent_library_dir)/libGLESv2.dll',
'<(libchromiumcontent_resources_dir)/icudtl.dat', '<(libchromiumcontent_resources_dir)/icudtl.dat',
@ -663,7 +663,6 @@
'mac_bundle_resources': [ 'mac_bundle_resources': [
'atom/common/resources/mac/MainMenu.xib', 'atom/common/resources/mac/MainMenu.xib',
'<(libchromiumcontent_resources_dir)/content_shell.pak', '<(libchromiumcontent_resources_dir)/content_shell.pak',
'<(libchromiumcontent_resources_dir)/icudtl.dat',
], ],
'xcode_settings': { 'xcode_settings': {
'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist', 'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',

4
atom/app/atom_main_delegate.cc
View file

@ -52,10 +52,6 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
} }
void AtomMainDelegate::PreSandboxStartup() { void AtomMainDelegate::PreSandboxStartup() {
#if defined(OS_MACOSX)
OverrideChildProcessPath();
OverrideFrameworkBundlePath();
#endif
InitializeResourceBundle(); InitializeResourceBundle();
CommandLine* command_line = CommandLine::ForCurrentProcess(); CommandLine* command_line = CommandLine::ForCurrentProcess();