[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 14cb7e5c625e00ad041cabbbe6be599c43578f2c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 13 00:27:10 2009 +0000

    2009-10-12  Yaar Schnitman  <yaar at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Chromium Port - Windows
            https://bugs.webkit.org/show_bug.cgi?id=29969
    
            * chromium/DEPS: Added gtest dep required by windows and incremented some of the deps revisions.
    2009-10-12  Yaar Schnitman  <yaar at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Chromium Port - Windows
            https://bugs.webkit.org/show_bug.cgi?id=29969
    
            * Scripts/pdevenv: removed msvc's /useenv for chromium builds
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9293336..9fa393c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-12  Yaar Schnitman  <yaar at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Chromium Port - Windows
+        https://bugs.webkit.org/show_bug.cgi?id=29969
+
+        * chromium/DEPS: Added gtest dep required by windows and incremented some of the deps revisions.
+
 2009-10-06  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 514a640..5f5b9b8 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -35,17 +35,18 @@ vars = {
   'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
 
   # Dependencies' revisions to use:
-  'chromium_rev': '27692',
+  'chromium_rev': '28710',
   'google-url_rev': '119',
-  'gyp_rev': '671',
+  'gtest_rev': '329',
+  'gyp_rev': '685',
   'icu_rev': '27687',
-  'openvcdiff_rev': '26',
-  'skia_rev': '341',
-  'v8_rev': '2966',
+  'openvcdiff_rev': '28',
+  'skia_rev': '376',
+  'v8_rev': '3030',
 
   # Windows:
   'cygwin_rev': '11984',
-  'ffmpeg_ia32_rev': '26428',
+  'ffmpeg_ia32_rev': '28488',
   'pthreads-win32_rev': '26716',
   'python_24_rev': '22967',
 }
@@ -72,11 +73,15 @@ deps = {
   # testing
   'testing':
     Var('chromium_svn')+'/testing@'+Var('chromium_rev'),
+  'testing/gtest':
+    'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),
 
   # v8 javascript engine
   'v8':
     'http://v8.googlecode.com/svn/trunk@'+Var('v8_rev'),
-  
+  'testing/gtest':
+    'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),
+
   # net dependencies
   'net':
     Var('chromium_svn')+'/net@'+Var('chromium_rev'),
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ed25347..381460f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-12  Yaar Schnitman  <yaar at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Chromium Port - Windows
+        https://bugs.webkit.org/show_bug.cgi?id=29969
+
+        * Scripts/pdevenv: removed msvc's /useenv for chromium builds
+        * Scripts/webkitdirs.pm:
+
 2009-10-12  Csaba Osztrogonac  <ossy at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/pdevenv b/WebKitTools/Scripts/pdevenv
index 818e4ee..1530ff4 100755
--- a/WebKitTools/Scripts/pdevenv
+++ b/WebKitTools/Scripts/pdevenv
@@ -28,8 +28,8 @@ if ($ENV{'VS80COMNTOOLS'}) {
 print $fh "\@echo off\n\n";
 print $fh "call \"\%" . $vsToolsVar . "\%\\vsvars32.bat\"\n\n";
 print $fh "set PATH=$vcBin;$scriptsPath;\%PATH\%\n\n";
-print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com /useenv " . join(" ", @ARGV) . ") ELSE ";
-print $fh "VCExpress.exe /useenv " . join(" ", @ARGV) . "\n";
+print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com " . join(" ", @ARGV) . ") ELSE ";
+print $fh "VCExpress.exe " . join(" ", @ARGV) . "\n";
 
 close $fh;
 
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 0c22c1c..e93e80e 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1118,7 +1118,12 @@ sub buildVisualStudioProject
         $action = "/clean";
     }
 
-    my @command = ($vcBuildPath, $winProjectPath, $action, $config);
+    my $useenv = "/useenv";
+    if (isChromium()) {
+        $useenv = "";
+    }
+
+    my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config);
 
     print join(" ", @command), "\n";
     return system @command;

-- 
WebKit Debian packaging