Fix Mac production builds.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Feb 2011 23:20:09 +0000 (23:20 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Feb 2011 23:20:09 +0000 (23:20 +0000)
../JavaScriptCore:

* JavaScriptCore.xcodeproj/project.pbxproj:

../WebCore:

* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollbarThemeMac.h:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/mac/ScrollAnimatorMac.h
Source/WebCore/platform/mac/ScrollbarThemeMac.h

index 8920fc6..0a6be32 100644 (file)
@@ -1,5 +1,11 @@
 2011-02-01  Sam Weinig  <sam@webkit.org>
 
+        Fix Mac production builds.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
+2011-02-01  Sam Weinig  <sam@webkit.org>
+
         Try to fix the windows build.
 
         * DerivedSources.make:
index b7cb8dc..3afe29a 100644 (file)
                BC6AAAE50E1F426500AD87D8 /* ClassInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = BC756FC70E2031B200DE7D12 /* JSGlobalObjectFunctions.h */; };
                BC7F8FB90E19D1C3008632C0 /* JSNumberCell.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F8FB80E19D1C3008632C0 /* JSNumberCell.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC8149EF12F8A1AE007B2C32 /* HeaderDetection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8149AF12F89F53007B2C32 /* HeaderDetection.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC87CDB910712AD4000614CF /* JSONObject.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BC87CDB810712ACA000614CF /* JSONObject.lut.h */; };
                BC9041480EB9250900FE26FA /* StructureTransitionTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9041470EB9250900FE26FA /* StructureTransitionTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC95437D0EBA70FD0072B6D3 /* PropertyMapHashTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BC95437C0EBA70FD0072B6D3 /* PropertyMapHashTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
                                A7DCB97312E5193F00911940 /* WriteBarrier.h in Headers */,
                                E49DC16C12EF294E00184A1F /* SourceProviderCache.h in Headers */,
                                E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */,
-                               BC8149EF12F8A1AE007B2C32 /* HeaderDetection.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 5052312..dc627f2 100644 (file)
@@ -1,3 +1,12 @@
+2011-02-01  Sam Weinig  <sam@webkit.org>
+
+        Fix Mac production builds.
+
+        * DerivedSources.make:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollbarThemeMac.h:
+
 2011-02-01  Darin Adler  <darin@apple.com>
 
         Reviewed by Chris Fleizach.
index ef2dc2f..4db28bf 100644 (file)
@@ -569,6 +569,7 @@ all : \
     MathMLNames.cpp \
     XPathGrammar.cpp \
     tokenizer.cpp \
+    HeaderDetection.h \
 #
 
 # --------
@@ -932,3 +933,14 @@ DOM%.h : %.idl $(DOM_BINDINGS_SCRIPTS) bindings/objc/PublicDOMInterfaces.h
 endif # MACOS
 
 # ------------------------
+
+# header detection
+
+ifeq ($(OS),MACOS)
+
+HeaderDetection.h : DerivedSources.make /System/Library/CoreServices/SystemVersion.plist
+       rm -f $@
+       echo "/* This is a generated file. Do not edit. */" > $@
+       if [ -f $(SDKROOT)/System/Library/Frameworks/AppKit.framework/PrivateHeaders/NSScrollerImpPair_Private.h ]; then echo "#define USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER 1" >> $@; else echo >> $@; fi
+
+endif
index d1d2ad1..22acedc 100644 (file)
                BC7FA6800D1F167900DB22A9 /* SelectorNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorNodeList.cpp; sourceTree = "<group>"; };
                BC80C9850CD294EE00A0B7B3 /* CSSTimingFunctionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSTimingFunctionValue.cpp; sourceTree = "<group>"; };
                BC80C9860CD294EE00A0B7B3 /* CSSTimingFunctionValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSTimingFunctionValue.h; sourceTree = "<group>"; };
+               BC814A4112F8C34A007B2C32 /* HeaderDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderDetection.h; sourceTree = "<group>"; };
                BC8243250D0CE8A200460C8F /* JSSQLError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLError.h; sourceTree = "<group>"; };
                BC8243260D0CE8A200460C8F /* JSSQLTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLTransaction.h; sourceTree = "<group>"; };
                BC8243E60D0CFD7500460C8F /* WindowFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFeatures.cpp; sourceTree = "<group>"; };
                                6565814709D13043000E61D7 /* CSSValueKeywords.gperf */,
                                6565814809D13043000E61D7 /* CSSValueKeywords.h */,
                                E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */,
+                               BC814A4112F8C34A007B2C32 /* HeaderDetection.h */,
                                A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */,
                                A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */,
                                A8BC04911214F69600B5F122 /* HTMLEntityTable.cpp */,
index ccb8f29..6c6deb9 100644 (file)
 
 #include "FloatPoint.h"
 #include "FloatSize.h"
+#include "HeaderDetection.h"
 #include "ScrollAnimator.h"
 #include "Timer.h"
 #include "WebCoreSystemInterface.h"
-#include <JavaScriptCore/HeaderDetection.h>
 #include <wtf/RetainPtr.h>
 
 #ifdef __OBJC__
index 7bc66ab..76a059f 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef ScrollbarThemeMac_h
 #define ScrollbarThemeMac_h
 
+#include "HeaderDetection.h"
 #include "ScrollbarThemeComposite.h"
 #include "WebCoreSystemInterface.h"
-#include <JavaScriptCore/HeaderDetection.h>
 
 namespace WebCore {