[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[aroben at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 1ef1789eb53e24eca52ae59ab74043a72bd2f28f
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 23:46:21 2011 +0000

    Windows Production build fix
    
    Reviewed by Steve Falkenburg.
    
    * JavaScriptCore.vcproj/JavaScriptCore.make: Set BUILDSTYLE to Release_PGO at the very start
    of the file so that ConfigurationBuildDir takes that into account. Also set it the right way
    (by redefining the macro) rather than the wrong way (by modifying the environment variable).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 73c2b3d..47037dd 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-25  Adam Roben  <aroben at apple.com>
+
+        Windows Production build fix
+
+        Reviewed by Steve Falkenburg.
+
+        * JavaScriptCore.vcproj/JavaScriptCore.make: Set BUILDSTYLE to Release_PGO at the very start
+        of the file so that ConfigurationBuildDir takes that into account. Also set it the right way
+        (by redefining the macro) rather than the wrong way (by modifying the environment variable).
+
 2011-01-25  Steve Falkenburg  <sfalken at apple.com>
 
         Rubber-stamped by Adam Roben.
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
index 7f8e45a..68075f9 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
@@ -1,7 +1,7 @@
-!IF !defined(BUILDSTYLE)
-BUILDSTYLE=Release
-!ELSEIF "$(BUILDSTYLE)"=="DEBUG"
+!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG"
 BUILDSTYLE=Debug_All
+!ELSE
+BUILDSTYLE=Release_PGO
 !ENDIF
 
 install:
@@ -10,8 +10,7 @@ install:
     set WebKitOutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
     set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\4\ 
-!IF "$(BUILDSTYLE)"=="Release"
-    set BUILDSTYLE=Release_PGO
+!IF "$(BUILDSTYLE)"=="Release_PGO"
     devenv "JavaScriptCoreSubmit.sln" /rebuild $(BUILDSTYLE)
     set PATH=$(SYSTEMDRIVE)\cygwin\bin;$(PATH)
     xcopy "$(SRCROOT)\AppleInternal\tests\SunSpider\*" "%ConfigurationBuildDir%\tests\SunSpider" /e/v/i/h/y

-- 
WebKit Debian packaging