From 892f1aa7ce085c8ddf991f3cc90bd1c1da7cbc80 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 2 Jul 2013 12:10:14 +0800
Subject: [PATCH] Rename source_root to atom_source_root to avoid conflicts.

---
 atom.gyp                                          | 3 ++-
 common.gypi                                       | 1 -
 tools/{mac/source_root.py => atom_source_root.py} | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename tools/{mac/source_root.py => atom_source_root.py} (50%)
 mode change 100755 => 100644

diff --git a/atom.gyp b/atom.gyp
index b53bbfc..7f031b9 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -147,10 +147,11 @@
       '@rpath/Quincy.framework/Versions/A/Quincy',
       '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
     ],
+    'atom_source_root': '<!(python tools/atom_source_root.py)',
   },
   'target_defaults': {
     'mac_framework_dirs': [
-      '<(source_root)/frameworks',
+      '<(atom_source_root)/frameworks',
     ],
   },
   'targets': [
diff --git a/common.gypi b/common.gypi
index 658068d..8efe92b 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1,7 +1,6 @@
 {
   'variables': {
     'clang': 0,
-    'source_root': '<!(python tools/mac/source_root.py)',
     'conditions': [
       ['OS=="mac"', {
         'clang': 1,
diff --git a/tools/mac/source_root.py b/tools/atom_source_root.py
old mode 100755
new mode 100644
similarity index 50%
rename from tools/mac/source_root.py
rename to tools/atom_source_root.py
index 73ac5eb..93de124
--- a/tools/mac/source_root.py
+++ b/tools/atom_source_root.py
@@ -6,5 +6,4 @@ import os
 """
 
 
-relative_source_root = os.path.join(__file__, '..', '..', '..')
-print os.path.abspath(relative_source_root)
+print os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-- 
2.7.4