Changeset 57460 in webkit

Timestamp:

Apr 11, 2010 5:49:44 PM (14 years ago)

Author:

tony@chromium.org

Message:

2010-04-11 Tony Chang <​tony@chromium.org>

Reviewed by Darin Fisher.

[chromium] update chromium DEPS for upstream compile
​https://bugs.webkit.org/show_bug.cgi?id=36578

• DEPS:
• gyp_webkit: Add DumpRenderTree.gyp so we generate xcode projects for DRT.

2010-04-11 Tony Chang <​tony@chromium.org>

Reviewed by Darin Fisher.

[chromium] update chromium DEPS for upstream compile
​https://bugs.webkit.org/show_bug.cgi?id=36578

• DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Small fix to avoid a circular dependency between WebKit.gyp and webkit.gyp.

Location:

trunk

Files:

• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/DEPS (modified) (7 diffs)
• WebKit/chromium/gyp_webkit (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-11  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] update chromium DEPS for upstream compile
+        https://bugs.webkit.org/show_bug.cgi?id=36578
+
+        * DEPS:
+        * gyp_webkit: Add DumpRenderTree.gyp so we generate xcode projects for DRT.
+
 2010-04-10  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
-
-  # Dependencies' revisions to use:
   'chromium_rev': '43715',
-  'google-url_rev': '127',
-  'gtest_rev': '408',
-  'gyp_rev': '810',
-  'icu_rev': '43139',
-  'openvcdiff_rev': '28',
-  'ots_rev': '26',
-  'skia_rev': '504',
-  'v8_rev': '4335',
-
-  # Windows:
-  'cygwin_rev': '11984',
-  'ffmpeg_ia32_rev': '42726',
+
   'pthreads-win32_rev': '26716',
-  'python_24_rev': '22967',
-  'nss_rev': '39612',
 }
 
 deps = {
+  'chromium_deps':
+    File(Var('chromium_svn')+'/DEPS@'+Var('chromium_rev')),
+
   # build tools
   'build':
     Var('chromium_svn')+'/build@'+Var('chromium_rev'),
   'tools/gyp':
-    'http://gyp.googlecode.com/svn/trunk@'+Var('gyp_rev'),
+    From('chromium_deps', 'src/tools/gyp'),
 
   # Basic tools
@@ -70 +57 @@
   'skia':
     Var('chromium_svn')+'/skia@'+Var('chromium_rev'),
-  'third_party/skia':
-    'http://skia.googlecode.com/svn/trunk@'+Var('skia_rev'),
+  'third_party/skia/src':
+    From('chromium_deps', 'src/third_party/skia/src'),
+  'third_party/skia/include':
+    From('chromium_deps', 'src/third_party/skia/include'),
 
   # testing
@@ -77 +66 @@
     Var('chromium_svn')+'/testing@'+Var('chromium_rev'),
   'testing/gtest':
-    'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),
+    From('chromium_deps', 'src/testing/gtest'),
 
   # v8 javascript engine
-  'v8':
-    'http://v8.googlecode.com/svn/trunk@'+Var('v8_rev'),
-  'testing/gtest':
-    'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),
+  'v8': From('chromium_deps', 'src/v8'),
 
   # net dependencies
@@ -91 +77 @@
     Var('chromium_svn')+'/sdch@'+Var('chromium_rev'),
   'sdch/open-vcdiff':
-    'http://open-vcdiff.googlecode.com/svn/trunk@'+Var('openvcdiff_rev'),
+    From('chromium_deps', 'src/sdch/open-vcdiff'),
   'googleurl':
-    'http://google-url.googlecode.com/svn/trunk@'+Var('google-url_rev'),
+    From('chromium_deps', 'src/googleurl'),
+
+  # webkit dependencis
+  'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'),
+
+  'app':
+    Var('chromium_svn')+'/app@'+Var('chromium_rev'), # needed by appcache
+  'gpu':
+    Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
+  'media':
+    Var('chromium_svn')+'/media@'+Var('chromium_rev'),
+  'third_party/glew':  # webgl related
+    Var('chromium_svn')+'/third_party/glew@'+Var('chromium_rev'),
+  'third_party/ffmpeg': # needed by webkit/media
+    Var('chromium_svn')+'/third_party/ffmpeg@'+Var('chromium_rev'),
+  'third_party/yasm': # needed by ffmpeg
+    Var('chromium_svn')+'/third_party/yasm@'+Var('chromium_rev'),
+  'third_party/openmax': # needed by webkit/media
+    Var('chromium_svn')+'/third_party/openmax@'+Var('chromium_rev'),
+  'tools/grit':
+    Var('chromium_svn')+'/tools/grit@'+Var('chromium_rev'),
+  'tools/generate_stubs':
+    Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
 
   # other third party
   'third_party/icu':
-    Var('chromium_deps_svn')+'/icu42@'+Var('icu_rev'),
+    From('chromium_deps', 'src/third_party/icu'),
 
   'third_party/bzip2':
@@ -124 +132 @@
 
   'third_party/ots':
-    'http://ots.googlecode.com/svn/trunk@'+Var('ots_rev'),
+    From('chromium_deps', 'src/third_party/ots'),
 
   'third_party/sqlite':
@@ -139 +147 @@
   'win': {
     'third_party/cygwin':
-      Var('chromium_deps_svn')+'/cygwin@'+Var('cygwin_rev'),
-
+      From('chromium_deps', 'src/third_party/cygwin'),
     'third_party/python_24':
-      Var('chromium_deps_svn')+'/python_24@'+Var('python_24_rev'),
-
+      From('chromium_deps', 'src/third_party/python_24'),
     'third_party/ffmpeg/binaries/chromium/win/ia32':
-      Var('chromium_deps_svn')+'/ffmpeg/binaries/win@'+Var('ffmpeg_ia32_rev'),
-
+      From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
     'third_party/pthreads-win32':
-      Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'),
-
-   # base.gypi depends on nss on Windows
-   'third_party/nss':
-      Var('chromium_deps_svn')+'/nss@'+Var('nss_rev'),
+      'http://src.chromium.org/svn/trunk/deps/third_party/pthreads-win32@'+Var('pthreads-win32_rev'),
+    # base.gypi depends on nss on Windows
+    'third_party/nss':
+      From('chromium_deps', 'src/third_party/nss'),
+    'third_party/wtl':
+      Var('chromium_svn')+'/third_party/wtl@'+Var('chromium_rev'),
+  },
+  'mac': {
+    # needed by ffmpeg
+    'third_party/yasm/source/patched-yasm':
+      From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
+    'third_party/ffmpeg/source/patched-ffmpeg-mt':
+      From('chromium_deps', 'src/third_party/ffmpeg/source/patched-ffmpeg-mt'),
   },
   'unix': {
@@ -158 +171 @@
     'third_party/harfbuzz':
       Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'),
-
     'tools/xdisplaycheck':
       Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),

trunk/WebKit/chromium/gyp_webkit

@@ -92 +92 @@
                '--depth=./',
 
-               # gyp file to execute.
-               'WebKit.gyp'])
+               # gyp files to execute.
+               'WebKit.gyp',
+               '../../WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp'])
 
   print 'Updating webkit projects from gyp files...'

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-11  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] update chromium DEPS for upstream compile
+        https://bugs.webkit.org/show_bug.cgi?id=36578
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Small fix to avoid a circular dependency between
+          WebKit.gyp and webkit.gyp.
+
 2010-04-11  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

@@ -58 +58 @@
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
-                '<(chromium_src_dir)/webkit/webkit.gyp:webkit_support',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
             ],
             'include_dirs': [