Windows build fixes

WebCore:

        Build fix

        * platform/graphics/cg/GraphicsContextCG.cpp: Added missing #include.

WebKit/win:

        Windows build fix

        * Interfaces/WebKit.idl: Create the typelib version symbol ourselves.

WebKitLibraries:

        * win/tools/scripts/auto-version.sh: Removed a redundant symbol.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 18e411627d58ed5f808c0c702969b2fda37bd178..e4e6abe2416afd712fc010eb48d87769b55bc2c6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13  Adam Roben  <aroben@apple.com>
+
+        Build fix
+
+        * platform/graphics/cg/GraphicsContextCG.cpp: Added missing #include.
+
 2008-02-13  Matt Lilek  <webkit@mattlilek.com>
 
         Not reviewed, build fix.

diff --git a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index 569b2511d900ab9da11cd97e881b6608a7172ba0..289e3999da0199cb6cd40f1d5a4ef2b96784a513 100644 (file)
--- a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -36,6 +36,7 @@
 #include <CoreGraphics/CGBitmapContext.h>
 #include <CoreGraphics/CGPDFContext.h>
 #include <wtf/MathExtras.h>
+#include <wtf/RetainPtr.h>
 
 using namespace std;
 

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 972e211c9a69e7600929c6edfd335a4ccf4f9760..1956578f7e6ca940a392ba165d4932a7da23e492 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13  Adam Roben  <aroben@apple.com>
+
+        Windows build fix
+
+        * Interfaces/WebKit.idl: Create the typelib version symbol ourselves.
+
 2008-02-12  Steve Falkenburg  <sfalken@apple.com>
 
         Use a precompiled header to build WebKit.

diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index ca93479f5e4b9ae5ba483f5874d0c1ab15f79860..db0fbb4efa10b867ed2217a5660f9e55bf0119e4 100644 (file)
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -219,6 +219,8 @@ import "ocidl.idl";
 #include "IGEN_DOMStyleSheet.idl"
 #include "IGEN_DOMStyleSheetList.idl"
 
+#define __TYPELIB_VERSION__ __BUILD_NUMBER_MAJOR__##.##__BUILD_NUMBER_MINOR__
+
 [
 #if __PRODUCTION__
     uuid(2a748656-625d-4207-b29f-40c95bfeb3a9),
@@ -227,7 +229,7 @@ import "ocidl.idl";
     uuid(76E5F7F0-18FD-48a2-B549-1159435B513B),
     helpstring("OpenSourceWebKit " __BUILD_NUMBER_SHORT__ " Type Library"),
 #endif
-    version(__BUILD_NUMBER_MAJOR_MINOR__)
+    version(__TYPELIB_VERSION__)
 ]
 #if __PRODUCTION__
 library WebKit

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index b53c2fdd8e83f35843b996b492067e6c71708f06..ba67d2483434ef739cbb747ee8ee9a7ae800ead9 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-13  Adam Roben  <aroben@apple.com>
+
+        * win/tools/scripts/auto-version.sh: Removed a redundant symbol.
+
 2008-02-12  Adam Roben  <aroben@apple.com>
 
         Clean up auto-version.sh a bit

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index c8d207850e6944a8e281c4162c769f99ff4dd342..6bbfb5c4934d8bb88c7ea3ffb895c2173ca4bbde 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -79,6 +79,5 @@ cat > "$VERSIONFILE" <<EOF
 #define __BUILD_NUMBER_MAJOR__ $BLDMAJORVERSION
 #define __BUILD_NUMBER_MINOR__ $BLDMINORVERSION
 #define __BUILD_NUMBER_VARIANT__ $BLDVARIANTVERSION
-#define __BUILD_NUMBER_MAJOR_MINOR__ $BLDMAJORVERSION.$BLDMINORVERSION
 #define __SVN_REVISION__ $SVNREVISION
 EOF