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

Discard "framework_name"

Browse source 
We are using "'product_name' Framework" directly in C++, so we should
keep the name consistent in C++ and gyp
This commit is contained in:
Cheng Zhao 2014-12-29 09:49:10 -08:00
parent 9bd517e623
commit a9d67e9715
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
atom.gyp
View file

@ -5,7 +5,6 @@
], ],
'project_name': 'atom', 'project_name': 'atom',
'product_name': 'Atom', 'product_name': 'Atom',
'framework_name': 'Atom Framework',
'app_sources': [ 'app_sources': [
'atom/app/atom_main.cc', 'atom/app/atom_main.cc',
'atom/app/atom_main.h', 'atom/app/atom_main.h',
@ -420,7 +419,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)/<(framework_name).framework', '<(PRODUCT_DIR)/<(product_name) Framework.framework',
'external_binaries/Squirrel.framework', 'external_binaries/Squirrel.framework',
'external_binaries/ReactiveCocoa.framework', 'external_binaries/ReactiveCocoa.framework',
'external_binaries/Mantle.framework', 'external_binaries/Mantle.framework',
@ -786,7 +785,7 @@
'targets': [ 'targets': [
{ {
'target_name': '<(project_name)_framework', 'target_name': '<(project_name)_framework',
'product_name': '<(framework_name)', 'product_name': '<(product_name) Framework',
'type': 'shared_library', 'type': 'shared_library',
'dependencies': [ 'dependencies': [
'<(project_name)_lib', '<(project_name)_lib',
@ -822,7 +821,7 @@
'LIBRARY_SEARCH_PATHS': [ 'LIBRARY_SEARCH_PATHS': [
'<(libchromiumcontent_library_dir)', '<(libchromiumcontent_library_dir)',
], ],
'LD_DYLIB_INSTALL_NAME': '@rpath/<(framework_name).framework/<(framework_name)', 'LD_DYLIB_INSTALL_NAME': '@rpath/<(product_name) Framework.framework/<(product_name) Framework',
'LD_RUNPATH_SEARCH_PATHS': [ 'LD_RUNPATH_SEARCH_PATHS': [
'@loader_path/Libraries', '@loader_path/Libraries',
], ],
@ -832,14 +831,14 @@
}, },
'copies': [ 'copies': [
{ {
'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Libraries', 'destination': '<(PRODUCT_DIR)/<(product_name) Framework.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)/<(framework_name).framework/Versions/A/Resources', 'destination': '<(PRODUCT_DIR)/<(product_name) Framework.framework/Versions/A/Resources',
'files': [ 'files': [
'<(PRODUCT_DIR)/Inspector', '<(PRODUCT_DIR)/Inspector',
'<(PRODUCT_DIR)/crash_report_sender.app', '<(PRODUCT_DIR)/crash_report_sender.app',
@ -851,7 +850,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',
'<(framework_name)', '<(project_name) Framework',
'Libraries', 'Libraries',
'Frameworks', 'Frameworks',
], ],