[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b5dfce241abf77ba4de4756c5401e6074a73c877
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 15:25:05 2010 +0000

    Fix the path to InjectedBundle.dll in Debug_Internal builds
    
    Fixes <http://webkit.org/b/42994> WebKitTestRunner fails to load
    InjectedBundle.dll in the Debug_Internal configuration
    
    Reviewed by Anders Carlsson.
    
    * WebKitTestRunner/win/TestControllerWin.cpp:
    (WTR::TestController::initializeInjectedBundlePath): Add the _debug
    suffix only in Debug_All builds.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e9cb0d3..9b43cd2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-26  Adam Roben  <aroben at apple.com>
+
+        Fix the path to InjectedBundle.dll in Debug_Internal builds
+
+        Fixes <http://webkit.org/b/42994> WebKitTestRunner fails to load
+        InjectedBundle.dll in the Debug_Internal configuration
+
+        Reviewed by Anders Carlsson.
+
+        * WebKitTestRunner/win/TestControllerWin.cpp:
+        (WTR::TestController::initializeInjectedBundlePath): Add the _debug
+        suffix only in Debug_All builds.
+
 2010-07-25  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
index 232c396..987481a 100644
--- a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
@@ -41,7 +41,7 @@ void TestController::initializeInjectedBundlePath()
 {
     CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle);
     CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath);
-#ifndef NDEBUG
+#ifdef DEBUG_ALL
     CFStringAppendCString(bundlePath, "\\InjectedBundle_debug.dll", kCFStringEncodingWindowsLatin1);
 #else
     CFStringAppendCString(bundlePath, "\\InjectedBundle.dll", kCFStringEncodingWindowsLatin1);

-- 
WebKit Debian packaging