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

PRODUCT_NAME => ATOM_PRODUCT_NAME

Browse source
This commit is contained in:
Cheng Zhao 2015-04-14 14:13:03 +08:00
parent a72c7b38a5
commit c20dc06c96
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom.gyp
View file

@ -11,6 +11,10 @@
'vendor/native_mate/native_mate_files.gypi', 'vendor/native_mate/native_mate_files.gypi',
], ],
'target_defaults': { 'target_defaults': {
'defines': [
'ATOM_PRODUCT_NAME="<(product_name)"',
'ATOM_PROJECT_NAME="<(project_name)"',
],
'mac_framework_dirs': [ 'mac_framework_dirs': [
'<(atom_source_root)/external_binaries', '<(atom_source_root)/external_binaries',
], ],
@ -201,7 +205,6 @@
'vendor/node/node.gyp:node', 'vendor/node/node.gyp:node',
], ],
'defines': [ 'defines': [
'PRODUCT_NAME="<(product_name)"',
# This is defined in skia/skia_common.gypi. # This is defined in skia/skia_common.gypi.
'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_GETTOPDEVICE',
# Disable warnings for g_settings_list_schemas. # Disable warnings for g_settings_list_schemas.
@ -371,9 +374,6 @@
'vendor', 'vendor',
'<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)',
], ],
'defines': [
'PRODUCT_NAME="<(product_name)"',
],
'export_dependent_settings': [ 'export_dependent_settings': [
'<(project_name)_lib', '<(project_name)_lib',
], ],

2
atom/app/atom_library_main.mm
View file

@ -29,7 +29,7 @@ int AtomInitializeICUandStartNode(int argc, char *argv[]) {
brightray::MainApplicationBundlePath() brightray::MainApplicationBundlePath()
.Append("Contents") .Append("Contents")
.Append("Frameworks") .Append("Frameworks")
.Append(PRODUCT_NAME " Framework.framework")); .Append(ATOM_PRODUCT_NAME " Framework.framework"));
base::i18n::InitializeICU(); base::i18n::InitializeICU();
return atom::NodeMain(argc, argv); return atom::NodeMain(argc, argv);
} }

5
atom/app/atom_main_delegate_mac.mm
View file

@ -33,12 +33,13 @@ base::FilePath GetHeleprAppPath(const base::FilePath& frameworks_path,
void AtomMainDelegate::OverrideFrameworkBundlePath() { void AtomMainDelegate::OverrideFrameworkBundlePath() {
base::mac::SetOverrideFrameworkBundlePath( base::mac::SetOverrideFrameworkBundlePath(
GetFrameworksPath().Append(PRODUCT_NAME " Framework.framework")); GetFrameworksPath().Append(ATOM_PRODUCT_NAME " Framework.framework"));
} }
void AtomMainDelegate::OverrideChildProcessPath() { void AtomMainDelegate::OverrideChildProcessPath() {
base::FilePath frameworks_path = GetFrameworksPath(); base::FilePath frameworks_path = GetFrameworksPath();
base::FilePath helper_path = GetHeleprAppPath(frameworks_path, PRODUCT_NAME); base::FilePath helper_path = GetHeleprAppPath(frameworks_path,
ATOM_PRODUCT_NAME);
if (!base::PathExists(helper_path)) if (!base::PathExists(helper_path))
helper_path = GetHeleprAppPath(frameworks_path, helper_path = GetHeleprAppPath(frameworks_path,
brightray::GetApplicationName()); brightray::GetApplicationName());

2
atom/browser/atom_browser_main_parts_mac.mm
View file

@ -26,7 +26,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
base::FilePath frameworkPath = brightray::MainApplicationBundlePath() base::FilePath frameworkPath = brightray::MainApplicationBundlePath()
.Append("Contents") .Append("Contents")
.Append("Frameworks") .Append("Frameworks")
.Append(PRODUCT_NAME " Framework.framework"); .Append(ATOM_PRODUCT_NAME " 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"