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

aroben at apple.com aroben at apple.com
Sun Feb 20 23:44:52 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit f4025fd152e358474d3caff04b329c48b9ce1093
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 22:17:39 2011 +0000

    Windows Production build fix
    
    Source/JavaScriptCore:
    
    * JavaScriptCore.vcproj/JavaScriptCore.make: Update for move of JavaScriptCore into Source.
    
    Source/WebCore:
    
    * WebCore.vcproj/WebCore.make: Update for move of WebCore into Source.
    
    Source/WebKit/win:
    
    * WebKit.vcproj/WebKit.make: Update for move of WebKit into Source.
    
    Source/WebKit2:
    
    * win/WebKit2.make: Update for move of WebKit2 into Source.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7d24a40..a7f05f4 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-24  Adam Roben  <aroben at apple.com>
+
+        Windows Production build fix
+
+        * JavaScriptCore.vcproj/JavaScriptCore.make: Update for move of JavaScriptCore into Source.
+
 2011-01-24  Peter Varga  <pvarga at webkit.org>
 
         Reviewed by Oliver Hunt.
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
index 1f83397..f55958b 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
@@ -9,7 +9,7 @@ install:
     set WebKitLibrariesDir=$(SRCROOT)\AppleInternal
     set WebKitOutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-    set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\ 
+    set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\4\ 
 !IF "$(BUILDSTYLE)"=="Release"
     BUILDSTYLE=Release_PGO
     devenv "JavaScriptCoreSubmit.sln" /rebuild $(BUILDSTYLE)
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 92435f6..2ab6e7c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-24  Adam Roben  <aroben at apple.com>
+
+        Windows Production build fix
+
+        * WebCore.vcproj/WebCore.make: Update for move of WebCore into Source.
+
 2011-01-24  Anton Muhin  <antonm at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/Source/WebCore/WebCore.vcproj/WebCore.make b/Source/WebCore/WebCore.vcproj/WebCore.make
index 7bb6659..0b02031 100644
--- a/Source/WebCore/WebCore.vcproj/WebCore.make
+++ b/Source/WebCore/WebCore.vcproj/WebCore.make
@@ -9,7 +9,7 @@ install:
 	set WebKitLibrariesDir=$(SRCROOT)\AppleInternal
 	set WebKitOutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\ 
+	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\ 
 	-mkdir 2>NUL "%WebKitOutputDir%\include\private\JavaScriptCore"
 	xcopy "%WebKitLibrariesDir%\include\private\JavaScriptCore\*" "%WebKitOutputDir%\include\private\JavaScriptCore" /e/v/i/h/y
 	devenv "WebCore.submit.sln" /rebuild $(BUILDSTYLE)
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index e60e1d9..cefedc7 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-24  Adam Roben  <aroben at apple.com>
+
+        Windows Production build fix
+
+        * WebKit.vcproj/WebKit.make: Update for move of WebKit into Source.
+
 2011-01-21  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.make b/Source/WebKit/win/WebKit.vcproj/WebKit.make
index ef8e7a6..2bb8baa 100644
--- a/Source/WebKit/win/WebKit.vcproj/WebKit.make
+++ b/Source/WebKit/win/WebKit.vcproj/WebKit.make
@@ -8,7 +8,7 @@ install:
 	set WebKitLibrariesDir=$(SRCROOT)\AppleInternal
 	set WebKitOutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\ 
+	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\4\ 
 	set PRODUCTION=1
 	devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
 	-xcopy "$(ConfigurationBuildDir)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 2049d18..fc79827 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-24  Adam Roben  <aroben at apple.com>
+
+        Windows Production build fix
+
+        * win/WebKit2.make: Update for move of WebKit2 into Source.
+
 2011-01-24  Jessie Berlin  <jberlin at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/Source/WebKit2/win/WebKit2.make b/Source/WebKit2/win/WebKit2.make
index 7d1ea35..1d059b6 100755
--- a/Source/WebKit2/win/WebKit2.make
+++ b/Source/WebKit2/win/WebKit2.make
@@ -8,7 +8,7 @@ install:
 	set WebKitLibrariesDir=$(SRCROOT)\AppleInternal
 	set WebKitOutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\ 
+	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\ 
 	set PRODUCTION=1
 	devenv "WebKit2.submit.sln" /rebuild $(BUILDSTYLE)
 	-xcopy "$(ConfigurationBuildDir)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list