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

Rename source_root to atom_source_root to avoid conflicts.

Browse source
This commit is contained in:
Cheng Zhao 2013-07-02 12:10:14 +08:00
parent e87a7c286c
commit 892f1aa7ce
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom.gyp
View file

@ -147,10 +147,11 @@
'@rpath/Quincy.framework/Versions/A/Quincy', '@rpath/Quincy.framework/Versions/A/Quincy',
'${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}' '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
], ],
'atom_source_root': '<!(python tools/atom_source_root.py)',
}, },
'target_defaults': { 'target_defaults': {
'mac_framework_dirs': [ 'mac_framework_dirs': [
'<(source_root)/frameworks', '<(atom_source_root)/frameworks',
], ],
}, },
'targets': [ 'targets': [

1
common.gypi
View file

@ -1,7 +1,6 @@
{ {
'variables': { 'variables': {
'clang': 0, 'clang': 0,
'source_root': '<!(python tools/mac/source_root.py)',
'conditions': [ 'conditions': [
['OS=="mac"', { ['OS=="mac"', {
'clang': 1, 'clang': 1,

3
tools/mac/source_root.py → tools/atom_source_root.py Executable file → Normal file
View file

@ -6,5 +6,4 @@ import os
""" """
relative_source_root = os.path.join(__file__, '..', '..', '..') print os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
print os.path.abspath(relative_source_root)