Remove abuse of projectDirPath from WebKit.xcodeproj to fix Production builds.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 16:24:17 +0000 (16:24 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 16:24:17 +0000 (16:24 +0000)
Reviewed by Dave Kilzer.

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

WebKit/ChangeLog
WebKit/WebKit.xcodeproj/project.pbxproj
WebKit/mac/ChangeLog
WebKit/mac/Configurations/WebKit.xcconfig

index 9a7c30f3fb95246197462db04922503be5240812..ba2adb8e20be06d7b89f056d332c09ac56a9fa31 100644 (file)
@@ -1,3 +1,11 @@
+2007-12-12  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dave Kilzer.
+
+        Remove abuse of projectDirPath from WebKit.xcodeproj to fix Production builds.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
 2007-11-19  Brady Eidson <beidson@apple.com>
 
         Reviewed by Maciej
index 5d537ca178467e6c159417c2d166ca2620c4b39c..388493622365c70d4137d9019587d55faccb0be9 100644 (file)
                5241ADF60B1BC48A004012BD /* WebCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5241ADF40B1BC48A004012BD /* WebCache.mm */; };
                5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D7BF8120C2A1D90008CE06D /* WebInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5D7BF8150C2A1D90008CE06D /* WebInspector.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D7BF8130C2A1D90008CE06D /* WebInspector.mm */; };
+               5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */; };
+               5DE83A7B0D0F7F9400CAD12A /* WebViewEditingContextMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A760D0F7F9400CAD12A /* WebViewEditingContextMenu.nib */; };
+               5DE83A7C0D0F7F9400CAD12A /* WebViewEditingContextMenuOld.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A780D0F7F9400CAD12A /* WebViewEditingContextMenuOld.nib */; };
+               5DE83A7F0D0F7FAD00CAD12A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A7D0D0F7FAD00CAD12A /* Localizable.strings */; };
                5DE92FEF0BD7017E0059A5FD /* WebAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DE92FEE0BD7017E0059A5FD /* WebAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
                650F74E409E488F70020118A /* WebUnarchivingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F74E209E488F70020118A /* WebUnarchivingState.h */; };
                650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 650F74E309E488F70020118A /* WebUnarchivingState.m */; };
                939810AF0824BF01008DF038 /* WebFrameViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C6F14507920B93002449CD /* WebFrameViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65836F5E07EE425900682F95 /* WebPluginContainerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */; };
-               939810B30824BF01008DF038 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 35F3577E0198AAB80ACA1520 /* Localizable.strings */; };
-               939810B40824BF01008DF038 /* WebJavaScriptTextInputPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 9345D4E70365C58D008635CE /* WebJavaScriptTextInputPanel.nib */; };
                939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */; };
                939810B60824BF01008DF038 /* nullplugin.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5883BDE025E5C6A01000102 /* nullplugin.tiff */; };
                939810B70824BF01008DF038 /* url_icon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5B67130023EDF8901C1A525 /* url_icon.tiff */; };
-               939810B90824BF01008DF038 /* WebViewEditingContextMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8476113206EF82DB00AB2914 /* WebViewEditingContextMenu.nib */; };
                939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */; };
                939810BC0824BF01008DF038 /* WebBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3944607E020F50ED0ECA1767 /* WebBackForwardList.mm */; };
                939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39446080020F50ED0ECA1767 /* WebHistoryItem.mm */; };
                DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */; };
                DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = DD89681E09AA87240097E7F0 /* WebElementDictionary.h */; };
                DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */; };
-               ED3B48DF0CC51F7E00DFF1EB /* ../StringsNotToBeLocalized.txt in Resources */ = {isa = PBXBuildFile; fileRef = ED3B48DE0CC51F7E00DFF1EB /* ../StringsNotToBeLocalized.txt */; };
+               ED3B48DF0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt in Resources */ = {isa = PBXBuildFile; fileRef = ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */; };
                ED6BE2E7088C32B50044DEDC /* WebNSAttributedStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6BE2E5088C32B50044DEDC /* WebNSAttributedStringExtras.h */; };
                ED6BE2E8088C32B50044DEDC /* WebNSAttributedStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED6BE2E6088C32B50044DEDC /* WebNSAttributedStringExtras.mm */; };
                ED7F6D8B0980683500C235ED /* WebNSDataExtrasPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               EDD6132C0AED9990000B75CA /* WebViewEditingContextMenuOld.nib in Resources */ = {isa = PBXBuildFile; fileRef = EDD6132A0AED9990000B75CA /* WebViewEditingContextMenuOld.nib */; };
                EDE983800BCDF5FE00FDAE28 /* WebNSArrayExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE9837E0BCDF5FE00FDAE28 /* WebNSArrayExtras.h */; };
                EDE983810BCDF5FE00FDAE28 /* WebNSArrayExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = EDE9837F0BCDF5FE00FDAE28 /* WebNSArrayExtras.m */; };
 /* End PBXBuildFile section */
                1C68F664095B5FC100C2984E /* WebNodeHighlight.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNodeHighlight.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                1C68F665095B5FC100C2984E /* WebNodeHighlightView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNodeHighlightView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                1C68F666095B5FC100C2984E /* WebNodeHighlightView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNodeHighlightView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeaders.make; sourceTree = "<group>"; };
+               1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MigrateHeaders.make; path = mac/MigrateHeaders.make; sourceTree = "<group>"; };
                1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
                1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
                35081D9502B6D4D80ACA2ACA /* WebHTMLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHTMLView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                35081D9602B6D4D80ACA2ACA /* WebHTMLViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHTMLViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                35081DAE02B6D4F50ACA2ACA /* WebDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDocument.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               35F3577F0198AAB80ACA1520 /* English */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = text.plist.strings; name = English; path = ../English.lproj/Localizable.strings; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                3944606B020F50ED0ECA1767 /* WebDynamicScrollBarsView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDynamicScrollBarsView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                3944606C020F50ED0ECA1767 /* WebDynamicScrollBarsView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebDynamicScrollBarsView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                3944606E020F50ED0ECA1767 /* WebPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferences.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                5241ADF40B1BC48A004012BD /* WebCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCache.mm; sourceTree = "<group>"; };
                5D7BF8120C2A1D90008CE06D /* WebInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspector.h; sourceTree = "<group>"; };
                5D7BF8130C2A1D90008CE06D /* WebInspector.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspector.mm; sourceTree = "<group>"; };
+               5DE83A750D0F7F9400CAD12A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/WebJavaScriptTextInputPanel.nib; sourceTree = SOURCE_ROOT; };
+               5DE83A770D0F7F9400CAD12A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/WebViewEditingContextMenu.nib; sourceTree = SOURCE_ROOT; };
+               5DE83A790D0F7F9400CAD12A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/WebViewEditingContextMenuOld.nib; sourceTree = SOURCE_ROOT; };
+               5DE83A7E0D0F7FAD00CAD12A /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
                5DE92FEE0BD7017E0059A5FD /* WebAssertions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebAssertions.h; sourceTree = "<group>"; };
                650F74E209E488F70020118A /* WebUnarchivingState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebUnarchivingState.h; sourceTree = "<group>"; };
                650F74E309E488F70020118A /* WebUnarchivingState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebUnarchivingState.m; sourceTree = "<group>"; };
                8467275D0367158500CA2ACA /* WebPluginController.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPluginController.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84723BE3056D719E0044BFEA /* WebKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84723BE4056D719E0044BFEA /* WebKeyGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKeyGenerator.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               8476113306EF82DB00AB2914 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../English.lproj/WebViewEditingContextMenu.nib; sourceTree = "<group>"; };
                848DFF840365FE6A00CA2ACA /* WebPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPlugin.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                931633EE0AEDFFAE0062B92D /* WebFrameLoaderClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameLoaderClient.mm; sourceTree = "<group>"; };
                93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHTMLViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                931A72D203265920008635CE /* WebBaseNetscapePluginViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebBaseNetscapePluginViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; name = IDNScriptWhiteList.txt; path = Resources/IDNScriptWhiteList.txt; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = IDNScriptWhiteList.txt; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                933D659903413FF2008635CE /* WebClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebClipView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                933D659A03413FF2008635CE /* WebClipView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebClipView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345D17C0365BF35008635CE /* English */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = wrapper.nib; name = English; path = Panels/English.lproj/WebAuthenticationPanel.nib; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               9345D4E80365C58D008635CE /* English */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = wrapper.nib; name = English; path = ../English.lproj/WebJavaScriptTextInputPanel.nib; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebJavaScriptTextInputPanel.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345D4EB0365C5B2008635CE /* WebJavaScriptTextInputPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebJavaScriptTextInputPanel.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345DDAE0365FB27008635CE /* WebNSWindowExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSWindowExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345DDAF0365FB27008635CE /* WebNSWindowExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSWindowExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345DDB20365FFD0008635CE /* WebNSControlExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSControlExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345DDB30365FFD0008635CE /* WebNSControlExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSControlExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               939811320824BF01008DF038 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
+               939811320824BF01008DF038 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = mac/Info.plist; sourceTree = SOURCE_ROOT; tabWidth = 8; usesTabs = 1; };
                939811330824BF01008DF038 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                93AEB17D032C1735008635CE /* WebKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLogging.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93AEB17E032C1735008635CE /* WebKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLogging.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED21B9810528F7AA003299AC /* WebDocumentInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED2B2474033A2DA800C1A526 /* WebNSPasteboardExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSPasteboardExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED2B2475033A2DA800C1A526 /* WebNSPasteboardExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNSPasteboardExtras.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               ED3B48DE0CC51F7E00DFF1EB /* ../StringsNotToBeLocalized.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ../StringsNotToBeLocalized.txt; sourceTree = "<group>"; };
+               ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = StringsNotToBeLocalized.txt; sourceTree = SOURCE_ROOT; };
                ED6BE2E5088C32B50044DEDC /* WebNSAttributedStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSAttributedStringExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED6BE2E6088C32B50044DEDC /* WebNSAttributedStringExtras.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNSAttributedStringExtras.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDataExtrasPrivate.h; sourceTree = "<group>"; };
                EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSPrintOperationExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                EDD1A5C705C83987008E3150 /* WebNSPrintOperationExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSPrintOperationExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               EDD6132B0AED9990000B75CA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = ../English.lproj/WebViewEditingContextMenuOld.nib; sourceTree = "<group>"; };
                EDE850CD06ECC79E005FAB05 /* WebPreferenceKeysPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferenceKeysPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                EDE9837E0BCDF5FE00FDAE28 /* WebNSArrayExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNSArrayExtras.h; sourceTree = "<group>"; };
                EDE9837F0BCDF5FE00FDAE28 /* WebNSArrayExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSArrayExtras.m; sourceTree = "<group>"; };
                F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitStatisticsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F560BEBC030DAF4401C1A526 /* WebSearchableTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchableTextView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F560BEBD030DAF4401C1A526 /* WebSearchableTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebSearchableTextView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F5883BDE025E5C6A01000102 /* nullplugin.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = nullplugin.tiff; path = Resources/nullplugin.tiff; sourceTree = "<group>"; };
+               F5883BDE025E5C6A01000102 /* nullplugin.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = nullplugin.tiff; sourceTree = "<group>"; };
                F5883BE0025E5E9D01000102 /* WebNullPluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNullPluginView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5883BE1025E5E9D01000102 /* WebNullPluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNullPluginView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitErrors.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5AEBB3D024A527601C1A526 /* WebPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPreferences.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5AFB45E02B94DC8018635CA /* WebFrameBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameBridge.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5AFB45F02B94DC8018635CA /* WebFrameBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameBridge.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F5B67130023EDF8901C1A525 /* url_icon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = url_icon.tiff; path = Resources/url_icon.tiff; sourceTree = "<group>"; };
+               F5B67130023EDF8901C1A525 /* url_icon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = url_icon.tiff; sourceTree = "<group>"; };
                F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F5C283730284676D018635CA /* WebKitPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+               F5C283730284676D018635CA /* WebKitPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = WebKitPrefix.h; path = mac/WebKitPrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
                F5C2869402846DCD018635CA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
                F5C2869502846DCD018635CA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebURLsWithTitles.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5F717230288493C018635CA /* npapi.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = npapi.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5F7174C02885C5B018635CA /* WebViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5F7174D02885C5B018635CA /* WebViewFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewFactory.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F5F732D202FF4D4F01A80180 /* WebKit.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = WebKit.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+               F5F732D202FF4D4F01A80180 /* WebKit.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; name = WebKit.exp; path = mac/WebKit.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
                F5F81C3902B67C26018635CA /* WebRenderNode.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = WebRenderNode.h; path = ../WebView/WebRenderNode.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5F81C3A02B67C26018635CA /* WebRenderNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebRenderNode.mm; path = ../WebView/WebRenderNode.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F738C9E903FAD3DF0321FBE0 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                                F5F732D202FF4D4F01A80180 /* WebKit.exp */,
                                F5C283730284676D018635CA /* WebKitPrefix.h */,
                                6508A4A7099B375F00BCBF45 /* Default Delegates */,
-                               F52CA6C002DF9D78018635CA /* Download */,
                                F57D194A034E732C01A80180 /* DOM */,
                                25A8176801B5474B0ECA149E /* History */,
                                254DC334016E1D3F0ECA149E /* Misc */,
                        isa = PBXGroup;
                        children = (
                                939811320824BF01008DF038 /* Info.plist */,
-                               ED3B48DE0CC51F7E00DFF1EB /* ../StringsNotToBeLocalized.txt */,
-                               35F3577E0198AAB80ACA1520 /* Localizable.strings */,
+                               5DE83A7D0D0F7FAD00CAD12A /* Localizable.strings */,
+                               ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */,
                                F5883BDE025E5C6A01000102 /* nullplugin.tiff */,
                                F5B67130023EDF8901C1A525 /* url_icon.tiff */,
-                               9345D4E70365C58D008635CE /* WebJavaScriptTextInputPanel.nib */,
-                               8476113206EF82DB00AB2914 /* WebViewEditingContextMenu.nib */,
-                               EDD6132A0AED9990000B75CA /* WebViewEditingContextMenuOld.nib */,
                                9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */,
+                               5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */,
+                               5DE83A760D0F7F9400CAD12A /* WebViewEditingContextMenu.nib */,
+                               5DE83A780D0F7F9400CAD12A /* WebViewEditingContextMenuOld.nib */,
                        );
                        name = Resources;
-                       sourceTree = SOURCE_ROOT;
+                       path = mac/Resources;
+                       sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                };
                                1C68F665095B5FC100C2984E /* WebNodeHighlightView.h */,
                                1C68F666095B5FC100C2984E /* WebNodeHighlightView.m */,
                        );
-                       path = WebInspector;
+                       name = WebInspector;
+                       path = mac/WebInspector;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */,
                                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
                        );
-                       path = Configurations;
+                       name = Configurations;
+                       path = mac/Configurations;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */,
                                83730F9803FB1E660004736E /* WebKitErrors.m */,
                                84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */,
+                               93AEB17D032C1735008635CE /* WebKitLogging.h */,
+                               93AEB17E032C1735008635CE /* WebKitLogging.m */,
                                7082F56F038EADAA00A80180 /* WebKitNSStringExtras.h */,
                                7082F570038EADAA00A80180 /* WebKitNSStringExtras.m */,
+                               F53444CE02E87CBA018635CA /* WebKitStatistics.h */,
+                               F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */,
+                               F53444CF02E87CBA018635CA /* WebKitStatistics.m */,
                                BEE52D4A0473032500CA289C /* WebKitSystemBits.h */,
                                BEE52D4B0473032500CA289C /* WebKitSystemBits.m */,
                                1C0D40850AC1C8F40009C113 /* WebKitVersionChecks.h */,
                                DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */,
                                1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
                        );
-                       path = Misc;
+                       name = Misc;
+                       path = mac/Misc;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */,
                                F5E0A76F02B8FEE401C1A525 /* WebURLsWithTitles.m */,
                        );
-                       path = History;
+                       name = History;
+                       path = mac/History;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                51079D150CED11B00077247D /* WebSecurityOriginInternal.h */,
                                51079D160CED11B00077247D /* WebSecurityOriginPrivate.h */,
                        );
-                       path = Storage;
+                       name = Storage;
+                       path = mac/Storage;
                        sourceTree = "<group>";
                };
                51E94C0706C02CA300A9B09E /* PDF */ = {
                                515E27D00458CA4B00CA2D3A /* WebDefaultUIDelegate.m */,
                        );
                        name = "Default Delegates";
-                       path = DefaultDelegates;
+                       path = mac/DefaultDelegates;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                650F74E309E488F70020118A /* WebUnarchivingState.m */,
                                51A8B57A042834F700CA2D3A /* WebView.mm */,
                        );
-                       path = WebView;
+                       name = WebView;
+                       path = mac/WebView;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                        name = HTML;
                        sourceTree = "<group>";
                };
-               F52CA6C002DF9D78018635CA /* Download */ = {
-                       isa = PBXGroup;
-                       children = (
-                               93AEB17D032C1735008635CE /* WebKitLogging.h */,
-                               93AEB17E032C1735008635CE /* WebKitLogging.m */,
-                               F53444CE02E87CBA018635CA /* WebKitStatistics.h */,
-                               F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */,
-                               F53444CF02E87CBA018635CA /* WebKitStatistics.m */,
-                       );
-                       name = Download;
-                       path = Misc;
-                       sourceTree = "<group>";
-                       tabWidth = 4;
-                       usesTabs = 0;
-               };
                F57D194A034E732C01A80180 /* DOM */ = {
                        isa = PBXGroup;
                        children = (
                                84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */,
                                846171FA0624AE5B0071A4A3 /* WebDOMOperations.mm */,
                        );
-                       path = DOM;
+                       name = DOM;
+                       path = mac/DOM;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */,
                                A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */,
                        );
-                       path = WebCoreSupport;
+                       name = WebCoreSupport;
+                       path = mac/WebCoreSupport;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                F5F717200288493C018635CA /* WebPluginDatabase.h */,
                                F5F717210288493C018635CA /* WebPluginDatabase.m */,
                        );
-                       path = Plugins;
+                       name = Plugins;
+                       path = mac/Plugins;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                F7EBEED203F9DBFE03CA0DE6 /* Glue */,
                                F7EBEED103F9DBEB03CA0DE6 /* C API */,
                        );
-                       path = Carbon;
+                       name = Carbon;
+                       path = mac/Carbon;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                                93154EF203A41270008635CE /* WebPanelAuthenticationHandler.m */,
                                9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */,
                        );
-                       path = Panels;
+                       name = Panels;
+                       path = mac/Panels;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                        );
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
-                       projectDirPath = mac;
+                       projectDirPath = "";
                        projectRoot = "";
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               ED3B48DF0CC51F7E00DFF1EB /* ../StringsNotToBeLocalized.txt in Resources */,
+                               ED3B48DF0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt in Resources */,
                                939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */,
-                               939810B30824BF01008DF038 /* Localizable.strings in Resources */,
                                939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */,
-                               939810B40824BF01008DF038 /* WebJavaScriptTextInputPanel.nib in Resources */,
-                               939810B90824BF01008DF038 /* WebViewEditingContextMenu.nib in Resources */,
-                               EDD6132C0AED9990000B75CA /* WebViewEditingContextMenuOld.nib in Resources */,
                                939810B60824BF01008DF038 /* nullplugin.tiff in Resources */,
                                939810B70824BF01008DF038 /* url_icon.tiff in Resources */,
+                               5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib in Resources */,
+                               5DE83A7B0D0F7F9400CAD12A /* WebViewEditingContextMenu.nib in Resources */,
+                               5DE83A7C0D0F7F9400CAD12A /* WebViewEditingContextMenuOld.nib in Resources */,
+                               5DE83A7F0D0F7FAD00CAD12A /* Localizable.strings in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        files = (
                        );
                        inputPaths = (
-                               "$(PROJECT_DIR)/WebKit.exp",
+                               "$(PROJECT_DIR)/mac/WebKit.exp",
                        );
                        outputPaths = (
                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${PROJECT_DIR}/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
+                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${PROJECT_DIR}/mac/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
                };
                1C5BFFFE0BAF8AEA004FF4F5 /* Check Bundle Version */ = {
                        isa = PBXShellScriptBuildPhase;
                        files = (
                        );
                        inputPaths = (
-                               "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+                               "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
                        );
                        name = "Check Bundle Version";
                        outputPaths = (
                        files = (
                        );
                        inputPaths = (
-                               "$(PROJECT_DIR)/MigrateWebCoreHeaders.make",
+                               "$(PROJECT_DIR)/mac/MigrateHeaders.make",
                        );
                        name = "Migrate Headers";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    make -f \"MigrateHeaders.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
+                       shellScript = "mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    make -C mac -f \"MigrateHeaders.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
                };
                5D2F7DB70C687A5A00B5B72B /* Update Info.plist with version information */ = {
                        isa = PBXShellScriptBuildPhase;
                        files = (
                        );
                        inputPaths = (
-                               "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+                               "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
                        );
                        name = "Update Info.plist with version information";
                        outputPaths = (
-                               "$(PROJECT_DIR)/Info.plist",
+                               "$(PROJECT_DIR)/mac/Info.plist",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\ntouch \"$PROJECT_DIR/Info.plist\"\n";
+                       shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\ntouch \"$PROJECT_DIR/mac/Info.plist\"\n";
                };
                939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
                        isa = PBXShellScriptBuildPhase;
                        files = (
                        );
                        inputPaths = (
-                               WebKit.pbproj,
+                               WebKit.xcodeproj,
                        );
                        name = "Make Frameworks Symbolic Link";
                        outputPaths = (
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-               35F3577E0198AAB80ACA1520 /* Localizable.strings */ = {
+               5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               35F3577F0198AAB80ACA1520 /* English */,
+                               5DE83A750D0F7F9400CAD12A /* English */,
                        );
-                       name = Localizable.strings;
-                       sourceTree = "<group>";
+                       name = WebJavaScriptTextInputPanel.nib;
+                       path = mac/Resources;
+                       sourceTree = SOURCE_ROOT;
                };
-               8476113206EF82DB00AB2914 /* WebViewEditingContextMenu.nib */ = {
+               5DE83A760D0F7F9400CAD12A /* WebViewEditingContextMenu.nib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               8476113306EF82DB00AB2914 /* English */,
+                               5DE83A770D0F7F9400CAD12A /* English */,
                        );
                        name = WebViewEditingContextMenu.nib;
-                       sourceTree = "<group>";
+                       path = mac/Resources;
+                       sourceTree = SOURCE_ROOT;
                };
-               9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */ = {
+               5DE83A780D0F7F9400CAD12A /* WebViewEditingContextMenuOld.nib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               9345D17C0365BF35008635CE /* English */,
+                               5DE83A790D0F7F9400CAD12A /* English */,
                        );
-                       name = WebAuthenticationPanel.nib;
-                       path = ..;
-                       sourceTree = "<group>";
+                       name = WebViewEditingContextMenuOld.nib;
+                       path = mac/Resources;
+                       sourceTree = SOURCE_ROOT;
                };
-               9345D4E70365C58D008635CE /* WebJavaScriptTextInputPanel.nib */ = {
+               5DE83A7D0D0F7FAD00CAD12A /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               9345D4E80365C58D008635CE /* English */,
+                               5DE83A7E0D0F7FAD00CAD12A /* English */,
                        );
-                       name = WebJavaScriptTextInputPanel.nib;
-                       sourceTree = "<group>";
+                       name = Localizable.strings;
+                       path = mac/Resources;
+                       sourceTree = SOURCE_ROOT;
                };
-               EDD6132A0AED9990000B75CA /* WebViewEditingContextMenuOld.nib */ = {
+               9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               EDD6132B0AED9990000B75CA /* English */,
+                               9345D17C0365BF35008635CE /* English */,
                        );
-                       name = WebViewEditingContextMenuOld.nib;
+                       name = WebAuthenticationPanel.nib;
+                       path = ..;
                        sourceTree = "<group>";
                };
 /* End PBXVariantGroup section */
                                        "-sectorder",
                                        __TEXT,
                                        __text,
-                                       WebKit.order,
+                                       mac/WebKit.order,
                                );
                        };
                        name = Production;
index b8a856929183aed282b0a69eb68ff26381cf7c71..73ff4275be11a23a1099806ab46fd94191ce5952 100644 (file)
@@ -1,3 +1,11 @@
+2007-12-12  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dave Kilzer.
+
+        Remove abuse of projectDirPath from WebKit.xcodeproj to fix Production builds.
+
+        * Configurations/WebKit.xcconfig:
+
 2007-12-11  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Darin Adler.
index cc9544059b94449a61209be260c85d6608f05bbb..d8f310678342aad1b100d4d597d1d50727316184 100644 (file)
@@ -1,16 +1,16 @@
 #include "Version.xcconfig"
 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
-EXPORTED_SYMBOLS_FILE_ = WebKit.exp;
-EXPORTED_SYMBOLS_FILE_i386 = WebKit.exp;
-EXPORTED_SYMBOLS_FILE_ppc = WebKit.exp;
+EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
+EXPORTED_SYMBOLS_FILE_i386 = mac/WebKit.exp;
+EXPORTED_SYMBOLS_FILE_ppc = mac/WebKit.exp;
 EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
 EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
 FEATURE_DEFINES = ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_SVG ENABLE_SVG_AS_IMAGE ENABLE_SVG_USE ENABLE_XPATH ENABLE_XSLT;
 FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
-GCC_PREFIX_HEADER = WebKitPrefix.h;
+GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit $(GCC_PREPROCESSOR_DEFINITIONS);
-HEADER_SEARCH_PATHS = ForwardingHeaders icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(HEADER_SEARCH_PATHS);
-INFOPLIST_FILE = Info.plist;
+HEADER_SEARCH_PATHS = mac/ForwardingHeaders mac/icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(HEADER_SEARCH_PATHS);
+INFOPLIST_FILE = mac/Info.plist;
 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
 PRODUCT_NAME = WebKit;