Changeset 49485 in webkit

Timestamp:

Oct 12, 2009 5:27:10 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-12 Yaar Schnitman <​yaar@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@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:

Location:

trunk

Files:

• WebKit/ChangeLog (modified) (1 diff)
• WebKit/chromium/DEPS (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/Scripts/pdevenv (modified) (1 diff)
• WebKitTools/Scripts/webkitdirs.pm (modified) (1 diff)

trunk/WebKit/ChangeLog

@@ +1 @@
+2009-10-12  Yaar Schnitman  <yaar@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@apple.com>
 

trunk/WebKit/chromium/DEPS

@@ -36 +36 @@
 
   # 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',
@@ -73 +74 @@
   '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':

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-10-12  Yaar Schnitman  <yaar@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@webkit.org>
 

trunk/WebKitTools/Scripts/pdevenv

@@ -29 +29 @@
 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;

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -1119 +1119 @@
     }
 
-    my @command = ($vcBuildPath, $winProjectPath, $action, $config);
+    my $useenv = "/useenv";
+    if (isChromium()) {
+        $useenv = "";
+    }
+
+    my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config);
 
     print join(" ", @command), "\n";