Skip to content
Permalink
Browse files
2010-06-01 Kent Tamura <tkent@chromium.org>
        Reviewed by Dimitri Glazkov.

        [DRT/Chromium] Checking out lighttpd
        https://bugs.webkit.org/show_bug.cgi?id=39948

        - Add lighttpd only on Windows. It is used by new-run-webkit-tests.
        - Add libvpx.
        - Remove pthreads-win32 from DEPS.
          It has not been used since Chromium r28642.
        - Update Chromium revision to use Windows resource query code and
          webkit_glue dependency fix.

        * DEPS:

Canonical link: https://commits.webkit.org/51569@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@60536 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
tkent-google committed Jun 2, 2010
1 parent 39fcc39 commit f6da55fd57917658195437b15c0e2df17bc93603
Showing 2 changed files with 23 additions and 5 deletions.
@@ -1,3 +1,19 @@
2010-06-01 Kent Tamura <tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Checking out lighttpd
https://bugs.webkit.org/show_bug.cgi?id=39948

- Add lighttpd only on Windows. It is used by new-run-webkit-tests.
- Add libvpx.
- Remove pthreads-win32 from DEPS.
It has not been used since Chromium r28642.
- Update Chromium revision to use Windows resource query code and
webkit_glue dependency fix.

* DEPS:

2010-06-01 James Hawkins <jhawkins@chromium.org>

UNREVIEWED: build fix.
@@ -32,9 +32,7 @@

vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
'chromium_rev': '47248',

'pthreads-win32_rev': '26716',
'chromium_rev': '48624',
}

deps = {
@@ -95,6 +93,10 @@ deps = {
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/libvpx/include':
From('chromium_deps', 'src/third_party/libvpx/include'),
'third_party/libvpx/lib':
From('chromium_deps', 'src/third_party/libvpx/lib'),
'third_party/yasm': # needed by ffmpeg
Var('chromium_svn')+'/third_party/yasm@'+Var('chromium_rev'),
'third_party/openmax': # needed by webkit/media
@@ -159,8 +161,8 @@ deps_os = {
From('chromium_deps', 'src/third_party/python_24'),
'third_party/ffmpeg/binaries/chromium/win/ia32':
From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
'third_party/pthreads-win32':
'http://src.chromium.org/svn/trunk/deps/third_party/pthreads-win32@'+Var('pthreads-win32_rev'),
'third_party/lighttpd':
From('chromium_deps', 'src/third_party/lighttpd'),
# base.gypi depends on nss on Windows
'third_party/nss':
From('chromium_deps', 'src/third_party/nss'),

0 comments on commit f6da55f

Please sign in to comment.