Replace depth with DEPTH, a gyp-predefined variable. DEPTH will always be set

to a relative path from a .gyp file's directory to the directory given in the
--depth argument.  As a special case, to aid in bootstrapping Chromium and to
preserve existing usage, gyp will use a "src" directory in the path to a .gyp
file as the default for the --depth argument.


git-svn-id: http://gyp.googlecode.com/svn/trunk@296 78cadc50-ecff-11dd-a971-7dbc132099af

27 files changed, 7 insertions, 77 deletions

diff --git a/samples/activex_shim.gyp b/samples/activex_shim.gyp
index 95199769..4964636f 100644
--- a/samples/activex_shim.gyp
+++ b/samples/activex_shim.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
   ],
diff --git a/samples/activex_shim_dll.gyp b/samples/activex_shim_dll.gyp
index e5cfb0a8..5555d1b6 100644
--- a/samples/activex_shim_dll.gyp
+++ b/samples/activex_shim_dll.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
   ],
diff --git a/samples/all.gyp b/samples/all.gyp
index ceca323f..66285671 100644
--- a/samples/all.gyp
+++ b/samples/all.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
diff --git a/samples/base.gyp b/samples/base.gyp
index 97a0ab40..c0649843 100644
--- a/samples/base.gyp
+++ b/samples/base.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
diff --git a/samples/bzip2.gyp b/samples/bzip2.gyp
index 8b2496d6..7ad96594 100644
--- a/samples/bzip2.gyp
+++ b/samples/bzip2.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/chrome.gyp b/samples/chrome.gyp
index 0bd2117c..710986a8 100644
--- a/samples/chrome.gyp
+++ b/samples/chrome.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
diff --git a/samples/common.gypi b/samples/common.gypi
index 79a38ac2..707400e6 100644
--- a/samples/common.gypi
+++ b/samples/common.gypi
@@ -102,7 +102,7 @@
           '_HAS_TR1=0',
         ],
         'include_dirs': [
-          '<(depth)/third_party/platformsdk_win2008_6_1/files/Include',
+          '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Include',
           '$(VSInstallDir)/VC/atlmfc/include',
         ],
         'msvs_cygwin_dirs': ['../third_party/cygwin'],
@@ -122,7 +122,7 @@
             'AdditionalOptions': '/ignore:4221',
             'OutputFile': '$(OutDir)\\lib\\$(ProjectName).lib',
             'AdditionalLibraryDirectories':
-              '<(depth)/third_party/platformsdk_win2008_6_1/files/Lib',
+              '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib',
           },
           'VCLinkerTool': {
             'AdditionalOptions':
@@ -136,7 +136,7 @@
               'psapi.lib',
             ],
             'AdditionalLibraryDirectories':
-              '<(depth)/third_party/platformsdk_win2008_6_1/files/Lib',
+              '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib',
             'DelayLoadDLLs': 'dwmapi.dll,uxtheme.dll',
             'GenerateDebugInformation': 'true',
             'MapFileName': '$(OutDir)\\$(TargetName).map',
@@ -155,7 +155,7 @@
           },
           'VCResourceCompilerTool': {
             'Culture' : '1033',
-            'AdditionalIncludeDirectories': '<(depth)',
+            'AdditionalIncludeDirectories': '<(DEPTH)',
           },
         },
       },
@@ -178,6 +178,6 @@
     # directory used by the non-gyp Xcode build system.  When the gyp-based
     # Xcode build system replaces the older system, this should be changed to
     # simply "xcodebuild" or some other suitable name.
-    'SYMROOT': '<(depth)/xcodebuild_gyp',
+    'SYMROOT': '<(DEPTH)/xcodebuild_gyp',
   },
 }
diff --git a/samples/googleurl.gyp b/samples/googleurl.gyp
index 0d7d2e3a..d5b3519e 100644
--- a/samples/googleurl.gyp
+++ b/samples/googleurl.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
   ],
diff --git a/samples/gtest.gyp b/samples/gtest.gyp
index 584fafa8..bbbf52e9 100644
--- a/samples/gtest.gyp
+++ b/samples/gtest.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
diff --git a/samples/icu38.gyp b/samples/icu38.gyp
index 0a06f337..bc4dd7c5 100644
--- a/samples/icu38.gyp
+++ b/samples/icu38.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/libevent.gyp b/samples/libevent.gyp
index b452d758..1b07037b 100644
--- a/samples/libevent.gyp
+++ b/samples/libevent.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
   ],
diff --git a/samples/libjpeg.gyp b/samples/libjpeg.gyp
index f190f62f..51709c17 100644
--- a/samples/libjpeg.gyp
+++ b/samples/libjpeg.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/libpng.gyp b/samples/libpng.gyp
index b2949fd9..76cad171 100644
--- a/samples/libpng.gyp
+++ b/samples/libpng.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/libxml.gyp b/samples/libxml.gyp
index e7ea7525..e4067e08 100644
--- a/samples/libxml.gyp
+++ b/samples/libxml.gyp
@@ -1,6 +1,5 @@
 {
   'variables': {
-    'depth': '../..',
     'conditions': [
       ['OS=="linux"', {'os_include': 'linux'}],
       ['OS=="mac"', {'os_include': 'mac'}],
diff --git a/samples/libxslt.gyp b/samples/libxslt.gyp
index 379ea5a0..3c0254b4 100644
--- a/samples/libxslt.gyp
+++ b/samples/libxslt.gyp
@@ -1,6 +1,5 @@
 {
   'variables': {
-    'depth': '../..',
     'conditions': [
       ['OS=="linux"', {'os_include': 'linux'}],
       ['OS=="mac"', {'os_include': 'mac'}],
diff --git a/samples/media.gyp b/samples/media.gyp
index 91d6a4cf..7e2d2190 100644
--- a/samples/media.gyp
+++ b/samples/media.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
diff --git a/samples/modp_b64.gyp b/samples/modp_b64.gyp
index 9d88ff31..3e28d361 100644
--- a/samples/modp_b64.gyp
+++ b/samples/modp_b64.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/net.gyp b/samples/net.gyp
index 4f89d57d..47d45e9c 100644
--- a/samples/net.gyp
+++ b/samples/net.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
@@ -521,13 +518,13 @@
               'rule_name': 'grit',
               'extension': 'grd',
               'inputs': [
-                '<(depth)/tools/grit/grit.py',
+                '<(DEPTH)/tools/grit/grit.py',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).h',
               ],
               'action':
-                ['python', '<(depth)/tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'],
+                ['python', '<(DEPTH)/tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'],
             },
           ],
           'direct_dependent_settings': {
diff --git a/samples/npapi.gyp b/samples/npapi.gyp
index 16cbcbe8..973457ce 100644
--- a/samples/npapi.gyp
+++ b/samples/npapi.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/sdch.gyp b/samples/sdch.gyp
index 51f12783..027435e1 100644
--- a/samples/sdch.gyp
+++ b/samples/sdch.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
   ],
diff --git a/samples/security_tests.gyp b/samples/security_tests.gyp
index b0515e1f..8804c0b0 100644
--- a/samples/security_tests.gyp
+++ b/samples/security_tests.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../../..',
-  },
   'includes': [
     '../../../build/common.gypi',
   ],
diff --git a/samples/skia.gyp b/samples/skia.gyp
index 7e552754..8f02dd5e 100644
--- a/samples/skia.gyp
+++ b/samples/skia.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '..',
-  },
   'includes': [
     '../build/common.gypi',
     '../build/external_code.gypi',
diff --git a/samples/sqlite.gyp b/samples/sqlite.gyp
index 3878153c..7c6ee8b1 100644
--- a/samples/sqlite.gyp
+++ b/samples/sqlite.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',
diff --git a/samples/test_shell.gyp b/samples/test_shell.gyp
index 7e361139..8cf5d0de 100644
--- a/samples/test_shell.gyp
+++ b/samples/test_shell.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../../..',
-  },
   'includes': [
     '../../../build/common.gypi',
   ],
diff --git a/samples/v8.gyp b/samples/v8.gyp
index 9060c55b..1d104cc4 100644
--- a/samples/v8.gyp
+++ b/samples/v8.gyp
@@ -1,6 +1,5 @@
 {
   'variables': {
-    'depth': '..',
     'base_source_files': [
       'src/third_party/dtoa/dtoa.c',
       'src/third_party/jscre/ASCIICType.h',
diff --git a/samples/webkit.gyp b/samples/webkit.gyp
index bbbe593b..4a8f79b1 100644
--- a/samples/webkit.gyp
+++ b/samples/webkit.gyp
@@ -1,6 +1,5 @@
 {
   'variables': {
-    'depth': '..',
     'feature_defines': [
       'ENABLE_DATABASE=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
diff --git a/samples/zlib.gyp b/samples/zlib.gyp
index 1a668815..82273c0f 100644
--- a/samples/zlib.gyp
+++ b/samples/zlib.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'depth': '../..',
-  },
   'includes': [
     '../../build/common.gypi',
     '../../build/external_code.gypi',