From fc60a673089bbf1c848fe073c8f2c3a2ee789b4c Mon Sep 17 00:00:00 2001 From: "mark%moxienet.com" Date: Mon, 10 Dec 2007 22:00:25 +0000 Subject: [PATCH] 383934 Re-organize targets to allow preference panes to use -bundle_loader. Use aggregate targets to build the application; set bundle loader for preference panes. r=smorgan sr=me git-svn-id: svn://10.0.0.236/trunk@240756 18797224-902f-48f8-a5cc-f745e15eee43 --- .../camino/Camino.xcodeproj/project.pbxproj | 1509 +++++------------ .../PreferencePanes/Navigation/Navigation.mm | 1 - mozilla/camino/config/PrefPane.xcconfig | 16 +- .../preferences}/PreferencePaneBase.h | 0 .../preferences}/PreferencePaneBase.mm | 0 5 files changed, 458 insertions(+), 1068 deletions(-) rename mozilla/camino/{PreferencePanes/Shared => src/preferences}/PreferencePaneBase.h (100%) rename mozilla/camino/{PreferencePanes/Shared => src/preferences}/PreferencePaneBase.mm (100%) diff --git a/mozilla/camino/Camino.xcodeproj/project.pbxproj b/mozilla/camino/Camino.xcodeproj/project.pbxproj index 6d34cc8d96e..0a8594a766f 100644 --- a/mozilla/camino/Camino.xcodeproj/project.pbxproj +++ b/mozilla/camino/Camino.xcodeproj/project.pbxproj @@ -6,6 +6,47 @@ objectVersion = 42; objects = { +/* Begin PBXAggregateTarget section */ + 7BDD26CC0D0DC2BA00BA05C6 /* Camino */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 7BDD26E20D0DC30200BA05C6 /* Build configuration list for PBXAggregateTarget "Camino" */; + buildPhases = ( + ); + dependencies = ( + 7BDD26D10D0DC2DE00BA05C6 /* PBXTargetDependency */, + 7BDD26E10D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26DF0D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26DD0D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26DB0D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26D90D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26D70D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26D50D0DC2E400BA05C6 /* PBXTargetDependency */, + 7BDD26D30D0DC2E400BA05C6 /* PBXTargetDependency */, + ); + name = Camino; + productName = Camino; + }; + 7BDD26E30D0DC30600BA05C6 /* CaminoStatic */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 7BDD26FB0D0DC33B00BA05C6 /* Build configuration list for PBXAggregateTarget "CaminoStatic" */; + buildPhases = ( + ); + dependencies = ( + 7BDD26F80D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26F60D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26F40D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26F20D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26F00D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26EE0D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26EC0D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26EA0D0DC31C00BA05C6 /* PBXTargetDependency */, + 7BDD26E80D0DC31C00BA05C6 /* PBXTargetDependency */, + ); + name = CaminoStatic; + productName = CaminoStatic; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 001FFD970C795D4500D9C2C8 /* contenteditable.css in Copy Gecko Resources */ = {isa = PBXBuildFile; fileRef = 001FFD930C795D3300D9C2C8 /* contenteditable.css */; }; 001FFD980C795D4500D9C2C8 /* designmode.css in Copy Gecko Resources */ = {isa = PBXBuildFile; fileRef = 001FFD940C795D3300D9C2C8 /* designmode.css */; }; @@ -42,37 +83,20 @@ 035A498E079DCA100084B05F /* History.h in Headers */ = {isa = PBXBuildFile; fileRef = 035A4988079DCA100084B05F /* History.h */; }; 035A498F079DCA100084B05F /* History.mm in Sources */ = {isa = PBXBuildFile; fileRef = 035A4989079DCA100084B05F /* History.mm */; }; 035A4990079DCA100084B05F /* History.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 035A498A079DCA100084B05F /* History.tiff */; }; - 035A4992079DCA8A0084B05F /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; - 035A4999079DCACD0084B05F /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; 035A4AA0079DCB0B0084B05F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 035A4AA1079DCB0B0084B05F /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; - 035A4AA2079DCB0B0084B05F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52D5CDB027D412A01A80166 /* Carbon.framework */; }; 035A4AA3079DCB0B0084B05F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; - 035A4AA4079DCB790084B05F /* History.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 035A4975079DC83D0084B05F /* History.prefPane */; }; 0382B4DA07303CCA00A0228A /* dl_manager.tif in Resources */ = {isa = PBXBuildFile; fileRef = 0382B4D907303CCA00A0228A /* dl_manager.tif */; }; 0382B4DB07303CCA00A0228A /* dl_manager.tif in Resources */ = {isa = PBXBuildFile; fileRef = 0382B4D907303CCA00A0228A /* dl_manager.tif */; }; - 03C5AB1907722F3400EAF77D /* Downloads.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 03C5AB1007722DFC00EAF77D /* Downloads.prefPane */; }; - 03C5AB1A07722F3E00EAF77D /* Downloads.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 03C5AB1007722DFC00EAF77D /* Downloads.prefPane */; }; - 03C5AB1B07722F4B00EAF77D /* Tabs.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 03E2D8530771F73F00BD2443 /* Tabs.prefPane */; }; - 03C5AB2C07722F8F00EAF77D /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; 03C5AC3507722FA200EAF77D /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52D5CDB027D412A01A80166 /* Carbon.framework */; }; 03C5AC3607722FA200EAF77D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 03C5AC3707722FA200EAF77D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; - 03C5AC3807722FA200EAF77D /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; - 03C5AC3907722FAF00EAF77D /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; - 03E2D86D0771F88C00BD2443 /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; 03E2D86E0771F89900BD2443 /* Tabs.h in Headers */ = {isa = PBXBuildFile; fileRef = 03E2D85E0771F78500BD2443 /* Tabs.h */; }; 03E2D86F0771F8D100BD2443 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03E2D85A0771F78500BD2443 /* Localizable.strings */; }; 03E2D8700771F8D100BD2443 /* Tabs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 03E2D85C0771F78500BD2443 /* Tabs.nib */; }; 03E2D8710771F8D100BD2443 /* Tabs.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 03E2D8600771F78500BD2443 /* Tabs.tiff */; }; 03E2D8720771F8EC00BD2443 /* Tabs.mm in Sources */ = {isa = PBXBuildFile; fileRef = 03E2D85F0771F78500BD2443 /* Tabs.mm */; }; - 03E2D8730771F8EC00BD2443 /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; - 03E2D8740771F90B00BD2443 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52D5CDB027D412A01A80166 /* Carbon.framework */; }; 03E2D8750771F90B00BD2443 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 03E2D8760771F90B00BD2443 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; - 03E2D8770771F90B00BD2443 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; - 03E2D9920771FBD400BD2443 /* Tabs.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 03E2D8530771F73F00BD2443 /* Tabs.prefPane */; }; - 03E8551607A17F35008076D5 /* History.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 035A4975079DC83D0084B05F /* History.prefPane */; }; 0E6A98A1097E0091007962C1 /* libucvmath.dylib in Copy Component Libraries */ = {isa = PBXBuildFile; fileRef = 0E6A9882097DFF9A007962C1 /* libucvmath.dylib */; }; 0E6A98A2097E00A6007962C1 /* mathml.css in Copy Gecko Resources */ = {isa = PBXBuildFile; fileRef = 0E6A9886097DFFD4007962C1 /* mathml.css */; }; 0E6A98A3097E00BB007962C1 /* mathml.dtd in Copy Gecko DTDs */ = {isa = PBXBuildFile; fileRef = 0E6A9888097DFFF4007962C1 /* mathml.dtd */; }; @@ -635,74 +659,39 @@ 3F44AD8305BDFB9F00CB4B08 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52D5CDD027D412A01A80166 /* SystemConfiguration.framework */; }; 3F44AD8405BDFB9F00CB4B08 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5FEDBCB02AD8DD101A967F3 /* QuickTime.framework */; }; 3F44AD8505BDFB9F00CB4B08 /* SharedMenusCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F55A4DED0380705A01A80166 /* SharedMenusCocoa.framework */; }; - 3F44AD8C05BDFB9F00CB4B08 /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; 3F44AD8D05BDFB9F00CB4B08 /* Appearance.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4E02DFF167013CA8EC /* Appearance.h */; }; 3F44AD8F05BDFB9F00CB4B08 /* Appearance.nib in Resources */ = {isa = PBXBuildFile; fileRef = F507A85903116FF301026D5D /* Appearance.nib */; }; 3F44AD9005BDFB9F00CB4B08 /* Appearance.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5A8CE5102DFF167013CA8EC /* Appearance.tiff */; }; 3F44AD9105BDFB9F00CB4B08 /* RegionMapping.plist in Resources */ = {isa = PBXBuildFile; fileRef = F5F9FBD902E13767012B5DB7 /* RegionMapping.plist */; }; 3F44AD9205BDFB9F00CB4B08 /* RegionNames.strings in Resources */ = {isa = PBXBuildFile; fileRef = F56F837402E47DB401EF35C9 /* RegionNames.strings */; }; 3F44AD9305BDFB9F00CB4B08 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5384906034977A101A80166 /* Localizable.strings */; }; - 3F44AD9505BDFB9F00CB4B08 /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; 3F44AD9605BDFB9F00CB4B08 /* Appearance.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4F02DFF167013CA8EC /* Appearance.mm */; }; - 3F44AD9805BDFB9F00CB4B08 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; 3F44AD9905BDFB9F00CB4B08 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; 3F44AD9A05BDFB9F00CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 3F44AD9B05BDFB9F00CB4B08 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52D5CDB027D412A01A80166 /* Carbon.framework */; }; - 3F44ADA205BDFB9F00CB4B08 /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; 3F44ADA305BDFB9F00CB4B08 /* Navigation.h in Headers */ = {isa = PBXBuildFile; fileRef = F52627D4027E982201000102 /* Navigation.h */; }; 3F44ADA505BDFB9F00CB4B08 /* Navigation.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F52627D8027E984501000102 /* Navigation.tiff */; }; 3F44ADA605BDFB9F00CB4B08 /* Navigation.nib in Resources */ = {isa = PBXBuildFile; fileRef = F507A85B0311895401026D5D /* Navigation.nib */; }; 3F44ADA705BDFB9F00CB4B08 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5FCDD5F03A035E501A9666E /* Localizable.strings */; }; - 3F44ADA905BDFB9F00CB4B08 /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; 3F44ADAA05BDFB9F00CB4B08 /* Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = F52627D5027E982201000102 /* Navigation.mm */; }; - 3F44ADAC05BDFB9F00CB4B08 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; 3F44ADAD05BDFB9F00CB4B08 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; }; 3F44ADAE05BDFB9F00CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 3F44ADAF05BDFB9F00CB4B08 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F52D5CDB027D412A01A80166 /* Carbon.framework */; }; 3F44ADB105BDFB9F00CB4B08 /* layout_printing.xpt in Copy Component XPTs */ = {isa = PBXBuildFile; fileRef = F6BD63F201B313EE01A962F7 /* layout_printing.xpt */; }; 3F44ADC505BDFBA000CB4B08 /* PrivacyPane.h in Headers */ = {isa = PBXBuildFile; fileRef = F57F2060029997E701000106 /* PrivacyPane.h */; }; 3F44ADC705BDFBA000CB4B08 /* Privacy.nib in Resources */ = {isa = PBXBuildFile; fileRef = F507A85D0311948201026D5D /* Privacy.nib */; }; 3F44ADC805BDFBA000CB4B08 /* Privacy.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F57F205F029997E701000106 /* Privacy.tiff */; }; 3F44ADC905BDFBA000CB4B08 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F517052F034B5E9701026D5D /* Localizable.strings */; }; 3F44ADCB05BDFBA000CB4B08 /* PrivacyPane.mm in Sources */ = {isa = PBXBuildFile; fileRef = F57F2061029997E701000106 /* PrivacyPane.mm */; }; - 3F44ADCC05BDFBA000CB4B08 /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; - 3F44ADCE05BDFBA000CB4B08 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 3F44ADCF05BDFBA000CB4B08 /* libembed_base_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F51D9B2D0209573701A80166 /* libembed_base_s.a */; }; 3F44ADD005BDFBA000CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 3F44ADD105BDFBA000CB4B08 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; - 3F44ADD205BDFBA000CB4B08 /* libunicharutil_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2CDA702383CE601A967DF /* libunicharutil_s.a */; }; - 3F44ADD305BDFBA000CB4B08 /* libmozjs.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD637F01B30EA301A962F7 /* libmozjs.dylib */; }; - 3F44ADD405BDFBA000CB4B08 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 3F44ADD505BDFBA000CB4B08 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 3F44ADD605BDFBA000CB4B08 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; 3F44ADDD05BDFBA000CB4B08 /* SecurityPane.h in Headers */ = {isa = PBXBuildFile; fileRef = F51704E9034A30DF01026D5D /* SecurityPane.h */; }; 3F44ADDF05BDFBA000CB4B08 /* Security.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F51704E8034A30DF01026D5D /* Security.tiff */; }; 3F44ADE005BDFBA000CB4B08 /* Security.nib in Resources */ = {isa = PBXBuildFile; fileRef = F51704EE034A30F101026D5D /* Security.nib */; }; - 3F44ADE205BDFBA000CB4B08 /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; 3F44ADE305BDFBA000CB4B08 /* SecurityPane.mm in Sources */ = {isa = PBXBuildFile; fileRef = F51704EA034A30DF01026D5D /* SecurityPane.mm */; }; - 3F44ADE505BDFBA000CB4B08 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 3F44ADE605BDFBA000CB4B08 /* libembed_base_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F51D9B2D0209573701A80166 /* libembed_base_s.a */; }; 3F44ADE705BDFBA000CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 3F44ADE805BDFBA000CB4B08 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; - 3F44ADE905BDFBA000CB4B08 /* libunicharutil_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2CDA702383CE601A967DF /* libunicharutil_s.a */; }; - 3F44ADEA05BDFBA000CB4B08 /* libmozjs.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD637F01B30EA301A962F7 /* libmozjs.dylib */; }; - 3F44ADEB05BDFBA000CB4B08 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 3F44ADEC05BDFBA000CB4B08 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 3F44ADED05BDFBA000CB4B08 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; 3F44ADF405BDFBA000CB4B08 /* WebFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = F5170515034A398F01026D5D /* WebFeatures.h */; }; 3F44ADF605BDFBA000CB4B08 /* WebFeatures.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5170517034A398F01026D5D /* WebFeatures.tiff */; }; 3F44ADF705BDFBA000CB4B08 /* WebFeatures.nib in Resources */ = {isa = PBXBuildFile; fileRef = F517051B034A399E01026D5D /* WebFeatures.nib */; }; - 3F44ADF905BDFBA000CB4B08 /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; 3F44ADFA05BDFBA000CB4B08 /* WebFeatures.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5170516034A398F01026D5D /* WebFeatures.mm */; }; - 3F44ADFC05BDFBA000CB4B08 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 3F44ADFD05BDFBA000CB4B08 /* libembed_base_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F51D9B2D0209573701A80166 /* libembed_base_s.a */; }; 3F44ADFE05BDFBA000CB4B08 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 3F44ADFF05BDFBA000CB4B08 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F557193A022B4102010001CA /* PreferencePanes.framework */; }; - 3F44AE0005BDFBA000CB4B08 /* libunicharutil_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2CDA702383CE601A967DF /* libunicharutil_s.a */; }; - 3F44AE0105BDFBA000CB4B08 /* libmozjs.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD637F01B30EA301A962F7 /* libmozjs.dylib */; }; - 3F44AE0205BDFBA000CB4B08 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 3F44AE0305BDFBA000CB4B08 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 3F44AE0405BDFBA000CB4B08 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; 3F44AE1105BDFBA000CB4B08 /* BrowserWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = F5125A110202064D01FAFD9F /* BrowserWrapper.h */; }; 3F44AE1205BDFBA000CB4B08 /* BrowserWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = F5AE04B20206A34801A967DF /* BrowserWindowController.h */; }; 3F44AE1305BDFBA000CB4B08 /* MainController.h in Headers */ = {isa = PBXBuildFile; fileRef = F5AE04B60206A37C01A967DF /* MainController.h */; }; @@ -1039,16 +1028,6 @@ 3F44AFC105BDFBA000CB4B08 /* SharedMenusCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F55A4DED0380705A01A80166 /* SharedMenusCocoa.framework */; }; 3F44AFC205BDFBA000CB4B08 /* libucvutil_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FEBFCA1044F989900A96652 /* libucvutil_s.a */; }; 3F44AFC305BDFBA000CB4B08 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F558E950552122E006156FD /* IOKit.framework */; }; - 3F44AFEE05BDFBA100CB4B08 /* Appearance.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44AD9F05BDFB9F00CB4B08 /* Appearance.prefPane */; }; - 3F44AFEF05BDFBA100CB4B08 /* Navigation.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44ADB305BDFBA000CB4B08 /* Navigation.prefPane */; }; - 3F44AFF005BDFBA100CB4B08 /* WebFeatures.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44AE0805BDFBA000CB4B08 /* WebFeatures.prefPane */; }; - 3F44AFF105BDFBA100CB4B08 /* Privacy.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44ADDA05BDFBA000CB4B08 /* Privacy.prefPane */; }; - 3F44AFF205BDFBA100CB4B08 /* Security.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44ADF105BDFBA000CB4B08 /* Security.prefPane */; }; - 3F44AFF405BDFBA100CB4B08 /* Appearance.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44AD9F05BDFB9F00CB4B08 /* Appearance.prefPane */; }; - 3F44AFF505BDFBA100CB4B08 /* Navigation.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44ADB305BDFBA000CB4B08 /* Navigation.prefPane */; }; - 3F44AFF605BDFBA100CB4B08 /* WebFeatures.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44AE0805BDFBA000CB4B08 /* WebFeatures.prefPane */; }; - 3F44AFF705BDFBA100CB4B08 /* Privacy.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44ADDA05BDFBA000CB4B08 /* Privacy.prefPane */; }; - 3F44AFF805BDFBA100CB4B08 /* Security.prefPane in Copy Preference Panes */ = {isa = PBXBuildFile; fileRef = 3F44ADF105BDFBA000CB4B08 /* Security.prefPane */; }; 3F44AFF905BDFBA000CB4B08 /* layout_printing.xpt in Copy Component XPTs */ = {isa = PBXBuildFile; fileRef = F6BD63F201B313EE01A962F7 /* layout_printing.xpt */; }; 3F8C005106800D8D00658CBC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3F8C004F06800D8D00658CBC /* Localizable.strings */; }; 3F8C005706800E1300658CBC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3F8C005506800E1300658CBC /* Localizable.strings */; }; @@ -1146,34 +1125,7 @@ 4D2996690869C5FA00E84287 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; 4D29966A0869C5FA00E84287 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; 4D29966B0869C5FA00E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D2997680869C71C00E84287 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 4D2997690869C71C00E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D29976A0869C71C00E84287 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; - 4D29976B0869C71C00E84287 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 4D29976C0869C71C00E84287 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 4D2997700869C75E00E84287 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 4D2997710869C75E00E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D2997720869C75E00E84287 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; - 4D2997730869C75E00E84287 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 4D2997740869C75E00E84287 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 4D29977F0869C91100E84287 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 4D2997800869C91100E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D2997810869C91100E84287 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; - 4D2997820869C91100E84287 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 4D2997830869C91100E84287 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 4D2997860869C93800E84287 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 4D2997870869C93800E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D2997880869C93800E84287 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; - 4D2997890869C93800E84287 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 4D29978A0869C93800E84287 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; - 4D29978D0869C95D00E84287 /* libxpcom.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57F0F470209DF5301A967DF /* libxpcom.dylib */; }; - 4D29978E0869C95D00E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D29978F0869C95D00E84287 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638201B30EA301A962F7 /* libplds4.dylib */; }; - 4D2997900869C95D00E84287 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638101B30EA301A962F7 /* libplc4.dylib */; }; - 4D2997910869C95D00E84287 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BD638001B30EA301A962F7 /* libnspr4.dylib */; }; 4D29989F0869CA5200E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D2998A20869CA5F00E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; - 4D2998A50869CA6B00E84287 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; 4D5881770864B28D001305B3 /* Default Plugin.plugin in Copy Gecko Plugins */ = {isa = PBXBuildFile; fileRef = F56610BC0394775201A9666E /* Default Plugin.plugin */; }; 4D58817B0864B2AE001305B3 /* Default Plugin.plugin in Copy Gecko Plugins */ = {isa = PBXBuildFile; fileRef = F56610BC0394775201A9666E /* Default Plugin.plugin */; }; 4DC28F5E099184B80081939B /* libucvmath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DC28F5D099184B80081939B /* libucvmath.a */; }; @@ -1194,6 +1146,21 @@ 6021CDDA0C84FDC4000E7754 /* CHStringBundleOverride.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6021CDD80C84FDC4000E7754 /* CHStringBundleOverride.mm */; }; 6021CDDB0C84FDC4000E7754 /* CHStringBundleOverride.h in Headers */ = {isa = PBXBuildFile; fileRef = 6021CDD70C84FDC4000E7754 /* CHStringBundleOverride.h */; }; 6021CDDC0C84FDC4000E7754 /* CHStringBundleOverride.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6021CDD80C84FDC4000E7754 /* CHStringBundleOverride.mm */; }; + 7B06E8140D0DC83B0032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E8150D0DC8800032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E8160D0DC8C20032E38A /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; + 7B06E8170D0DC8DC0032E38A /* PreferencePaneBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */; }; + 7B06E8180D0DC91A0032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E8190D0DC9250032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E81A0D0DC92E0032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E81E0D0DC9500032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E81F0D0DC9580032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E8200D0DC9620032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E8210D0DC96A0032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B06E8220D0DC9720032E38A /* PreferencePaneBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */; }; + 7B479B7D0D0DD5EB00780567 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; + 7B479CD90D0DD66800780567 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; + 7B479CDA0D0DD6AA00780567 /* libxpcom_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F12FC56072E8ECB00995ED9 /* libxpcom_core.dylib */; }; 7B64B7E10CCFDA640098406C /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B64B7CA0CCFD9F50098406C /* Sparkle.framework */; }; 7B64B7E30CCFDA860098406C /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B64B7CA0CCFD9F50098406C /* Sparkle.framework */; }; 7B64B7EE0CCFDAAF0098406C /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B64B7CA0CCFD9F50098406C /* Sparkle.framework */; }; @@ -1391,118 +1358,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 0380F470079DCCD90065A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 035A4974079DC83D0084B05F; - remoteInfo = HistoryPrefPane; - }; - 0380F472079DCCEC0065A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 035A4974079DC83D0084B05F; - remoteInfo = HistoryPrefPane; - }; - 03C5AB1207722EFC00EAF77D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 03C5AB0F07722DFC00EAF77D; - remoteInfo = DownloadsPrefPane; - }; - 03C5AB1407722F1100EAF77D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 03E2D8520771F73F00BD2443; - remoteInfo = TabbedBrowsingPrefPane; - }; - 03C5AB1607722F1100EAF77D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 03C5AB0F07722DFC00EAF77D; - remoteInfo = DownloadsPrefPane; - }; - 03E2D98F0771FB9300BD2443 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 03E2D8520771F73F00BD2443; - remoteInfo = TabbedBrowsingPrefPane; - }; - 3F44AFD505BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44AD8A05BDFB9F00CB4B08; - remoteInfo = "AppearancePrefPane (Upgraded)"; - }; - 3F44AFD705BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADA005BDFB9F00CB4B08; - remoteInfo = "NavigationPrefPane (Upgraded)"; - }; - 3F44AFD905BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADC305BDFBA000CB4B08; - remoteInfo = "PrivacyPrefPane (Upgraded)"; - }; - 3F44AFDB05BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADDB05BDFBA000CB4B08; - remoteInfo = "SecurityPrefPane (Upgraded)"; - }; - 3F44AFDD05BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADF205BDFBA000CB4B08; - remoteInfo = "WebFeaturesPrefPane (Upgraded)"; - }; - 3F44AFE105BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44AD8A05BDFB9F00CB4B08; - remoteInfo = "AppearancePrefPane (Upgraded)"; - }; - 3F44AFE305BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADA005BDFB9F00CB4B08; - remoteInfo = "NavigationPrefPane (Upgraded)"; - }; - 3F44AFE505BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADC305BDFBA000CB4B08; - remoteInfo = "PrivacyPrefPane (Upgraded)"; - }; - 3F44AFE705BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADDB05BDFBA000CB4B08; - remoteInfo = "SecurityPrefPane (Upgraded)"; - }; - 3F44AFE905BDFBA100CB4B08 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F44ADF205BDFBA000CB4B08; - remoteInfo = "WebFeaturesPrefPane (Upgraded)"; - }; 7B64B7C90CCFD9F50098406C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7B64B7BA0CCFD9F50098406C /* Sparkle.xcodeproj */; @@ -1538,6 +1393,132 @@ remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = Sparkle; }; + 7BDD26D00D0DC2DE00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ABD005BDFB9E00CB4B08; + remoteInfo = CaminoApp; + }; + 7BDD26D20D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADF205BDFBA000CB4B08; + remoteInfo = WebFeaturesPrefPane; + }; + 7BDD26D40D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 03C5AB0F07722DFC00EAF77D; + remoteInfo = DownloadsPrefPane; + }; + 7BDD26D60D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 03E2D8520771F73F00BD2443; + remoteInfo = TabsPrefPane; + }; + 7BDD26D80D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 035A4974079DC83D0084B05F; + remoteInfo = HistoryPrefPane; + }; + 7BDD26DA0D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADDB05BDFBA000CB4B08; + remoteInfo = SecurityPrefPane; + }; + 7BDD26DC0D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADC305BDFBA000CB4B08; + remoteInfo = PrivacyPrefPane; + }; + 7BDD26DE0D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44AD8A05BDFB9F00CB4B08; + remoteInfo = AppearancePrefPane; + }; + 7BDD26E00D0DC2E400BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADA005BDFB9F00CB4B08; + remoteInfo = NavigationPrefPane; + }; + 7BDD26E70D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADF205BDFBA000CB4B08; + remoteInfo = WebFeaturesPrefPane; + }; + 7BDD26E90D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 03C5AB0F07722DFC00EAF77D; + remoteInfo = DownloadsPrefPane; + }; + 7BDD26EB0D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 03E2D8520771F73F00BD2443; + remoteInfo = TabsPrefPane; + }; + 7BDD26ED0D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 035A4974079DC83D0084B05F; + remoteInfo = HistoryPrefPane; + }; + 7BDD26EF0D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADDB05BDFBA000CB4B08; + remoteInfo = SecurityPrefPane; + }; + 7BDD26F10D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADC305BDFBA000CB4B08; + remoteInfo = PrivacyPrefPane; + }; + 7BDD26F30D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44AD8A05BDFB9F00CB4B08; + remoteInfo = AppearancePrefPane; + }; + 7BDD26F50D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44ADA005BDFB9F00CB4B08; + remoteInfo = NavigationPrefPane; + }; + 7BDD26F70D0DC31C00BA05C6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F44AE0905BDFBA000CB4B08; + remoteInfo = CaminoStaticApp; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1919,24 +1900,6 @@ name = "Copy Security Chrome"; runOnlyForDeploymentPostprocessing = 0; }; - 3F44AD7105BDFB9F00CB4B08 /* Copy Preference Panes */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = Contents/PreferencePanes; - dstSubfolderSpec = 1; - files = ( - 3F44AFEE05BDFBA100CB4B08 /* Appearance.prefPane in Copy Preference Panes */, - 3F44AFEF05BDFBA100CB4B08 /* Navigation.prefPane in Copy Preference Panes */, - 3F44AFF005BDFBA100CB4B08 /* WebFeatures.prefPane in Copy Preference Panes */, - 3F44AFF105BDFBA100CB4B08 /* Privacy.prefPane in Copy Preference Panes */, - 3F44AFF205BDFBA100CB4B08 /* Security.prefPane in Copy Preference Panes */, - 03E2D9920771FBD400BD2443 /* Tabs.prefPane in Copy Preference Panes */, - 03C5AB1907722F3400EAF77D /* Downloads.prefPane in Copy Preference Panes */, - 035A4AA4079DCB790084B05F /* History.prefPane in Copy Preference Panes */, - ); - name = "Copy Preference Panes"; - runOnlyForDeploymentPostprocessing = 0; - }; 3F44AD7705BDFB9F00CB4B08 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 12; @@ -2194,24 +2157,6 @@ name = "Copy Security Chrome"; runOnlyForDeploymentPostprocessing = 0; }; - 3F44AF8005BDFBA000CB4B08 /* Copy Preference Panes */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = Contents/PreferencePanes; - dstSubfolderSpec = 1; - files = ( - 3F44AFF405BDFBA100CB4B08 /* Appearance.prefPane in Copy Preference Panes */, - 3F44AFF505BDFBA100CB4B08 /* Navigation.prefPane in Copy Preference Panes */, - 3F44AFF605BDFBA100CB4B08 /* WebFeatures.prefPane in Copy Preference Panes */, - 3F44AFF705BDFBA100CB4B08 /* Privacy.prefPane in Copy Preference Panes */, - 3F44AFF805BDFBA100CB4B08 /* Security.prefPane in Copy Preference Panes */, - 03C5AB1B07722F4B00EAF77D /* Tabs.prefPane in Copy Preference Panes */, - 03C5AB1A07722F3E00EAF77D /* Downloads.prefPane in Copy Preference Panes */, - 03E8551607A17F35008076D5 /* History.prefPane in Copy Preference Panes */, - ); - name = "Copy Preference Panes"; - runOnlyForDeploymentPostprocessing = 0; - }; 3F44AF8605BDFBA000CB4B08 /* Copy Libraries */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -2968,8 +2913,8 @@ F59E9F3D0237E28401A967DF /* ContentClickListener.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ContentClickListener.h; path = src/browser/ContentClickListener.h; sourceTree = ""; }; F59E9F3F0237E43401A967DF /* ContentClickListener.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = ContentClickListener.mm; path = src/browser/ContentClickListener.mm; sourceTree = ""; }; F5A112C902DF270F01026D5D /* loading-image.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = "loading-image.gif"; path = "resources/images/gecko/loading-image.gif"; sourceTree = SOURCE_ROOT; }; - F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencePaneBase.h; path = PreferencePanes/Shared/PreferencePaneBase.h; sourceTree = SOURCE_ROOT; }; - F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = PreferencePaneBase.mm; path = PreferencePanes/Shared/PreferencePaneBase.mm; sourceTree = SOURCE_ROOT; }; + F5A8CE4102DFEF4C013CA8EC /* PreferencePaneBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencePaneBase.h; sourceTree = ""; }; + F5A8CE4202DFEF4C013CA8EC /* PreferencePaneBase.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PreferencePaneBase.mm; sourceTree = ""; }; F5A8CE4E02DFF167013CA8EC /* Appearance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Appearance.h; path = PreferencePanes/Appearance/Appearance.h; sourceTree = SOURCE_ROOT; }; F5A8CE4F02DFF167013CA8EC /* Appearance.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = Appearance.mm; path = PreferencePanes/Appearance/Appearance.mm; sourceTree = SOURCE_ROOT; }; F5A8CE5002DFF167013CA8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PreferencePanes/Appearance/English.lproj/Appearance.nib; sourceTree = SOURCE_ROOT; }; @@ -3122,15 +3067,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4D29978D0869C95D00E84287 /* libxpcom.dylib in Frameworks */, - 4D29978E0869C95D00E84287 /* libxpcom_core.dylib in Frameworks */, - 4D29978F0869C95D00E84287 /* libplds4.dylib in Frameworks */, - 4D2997900869C95D00E84287 /* libplc4.dylib in Frameworks */, - 4D2997910869C95D00E84287 /* libnspr4.dylib in Frameworks */, 035A4AA0079DCB0B0084B05F /* Cocoa.framework in Frameworks */, - 035A4AA1079DCB0B0084B05F /* PreferencePanes.framework in Frameworks */, - 035A4AA2079DCB0B0084B05F /* Carbon.framework in Frameworks */, 035A4AA3079DCB0B0084B05F /* Foundation.framework in Frameworks */, + 7B479B7D0D0DD5EB00780567 /* libxpcom_core.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3138,15 +3077,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4D2997860869C93800E84287 /* libxpcom.dylib in Frameworks */, - 4D2997870869C93800E84287 /* libxpcom_core.dylib in Frameworks */, - 4D2997880869C93800E84287 /* libplds4.dylib in Frameworks */, - 4D2997890869C93800E84287 /* libplc4.dylib in Frameworks */, - 4D29978A0869C93800E84287 /* libnspr4.dylib in Frameworks */, 03C5AC3507722FA200EAF77D /* Carbon.framework in Frameworks */, 03C5AC3607722FA200EAF77D /* Cocoa.framework in Frameworks */, 03C5AC3707722FA200EAF77D /* Foundation.framework in Frameworks */, - 03C5AC3807722FA200EAF77D /* PreferencePanes.framework in Frameworks */, + 7B479CD90D0DD66800780567 /* libxpcom_core.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3154,15 +3088,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4D29977F0869C91100E84287 /* libxpcom.dylib in Frameworks */, - 4D2997800869C91100E84287 /* libxpcom_core.dylib in Frameworks */, - 4D2997810869C91100E84287 /* libplds4.dylib in Frameworks */, - 4D2997820869C91100E84287 /* libplc4.dylib in Frameworks */, - 4D2997830869C91100E84287 /* libnspr4.dylib in Frameworks */, - 03E2D8740771F90B00BD2443 /* Carbon.framework in Frameworks */, 03E2D8750771F90B00BD2443 /* Cocoa.framework in Frameworks */, 03E2D8760771F90B00BD2443 /* Foundation.framework in Frameworks */, - 03E2D8770771F90B00BD2443 /* PreferencePanes.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3199,15 +3126,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4D2997680869C71C00E84287 /* libxpcom.dylib in Frameworks */, - 4D2997690869C71C00E84287 /* libxpcom_core.dylib in Frameworks */, - 4D29976A0869C71C00E84287 /* libplds4.dylib in Frameworks */, - 4D29976B0869C71C00E84287 /* libplc4.dylib in Frameworks */, - 4D29976C0869C71C00E84287 /* libnspr4.dylib in Frameworks */, - 3F44AD9805BDFB9F00CB4B08 /* PreferencePanes.framework in Frameworks */, 3F44AD9905BDFB9F00CB4B08 /* Foundation.framework in Frameworks */, 3F44AD9A05BDFB9F00CB4B08 /* Cocoa.framework in Frameworks */, - 3F44AD9B05BDFB9F00CB4B08 /* Carbon.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3215,15 +3135,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4D2997700869C75E00E84287 /* libxpcom.dylib in Frameworks */, - 4D2997710869C75E00E84287 /* libxpcom_core.dylib in Frameworks */, - 4D2997720869C75E00E84287 /* libplds4.dylib in Frameworks */, - 4D2997730869C75E00E84287 /* libplc4.dylib in Frameworks */, - 4D2997740869C75E00E84287 /* libnspr4.dylib in Frameworks */, - 3F44ADAC05BDFB9F00CB4B08 /* PreferencePanes.framework in Frameworks */, 3F44ADAD05BDFB9F00CB4B08 /* Foundation.framework in Frameworks */, 3F44ADAE05BDFB9F00CB4B08 /* Cocoa.framework in Frameworks */, - 3F44ADAF05BDFB9F00CB4B08 /* Carbon.framework in Frameworks */, 7B64B7EE0CCFDAAF0098406C /* Sparkle.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3232,16 +3145,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADCE05BDFBA000CB4B08 /* libxpcom.dylib in Frameworks */, 4D29989F0869CA5200E84287 /* libxpcom_core.dylib in Frameworks */, - 3F44ADD305BDFBA000CB4B08 /* libmozjs.dylib in Frameworks */, - 3F44ADD405BDFBA000CB4B08 /* libnspr4.dylib in Frameworks */, - 3F44ADD505BDFBA000CB4B08 /* libplc4.dylib in Frameworks */, - 3F44ADD605BDFBA000CB4B08 /* libplds4.dylib in Frameworks */, - 3F44ADCF05BDFBA000CB4B08 /* libembed_base_s.a in Frameworks */, 3F44ADD005BDFBA000CB4B08 /* Cocoa.framework in Frameworks */, - 3F44ADD105BDFBA000CB4B08 /* PreferencePanes.framework in Frameworks */, - 3F44ADD205BDFBA000CB4B08 /* libunicharutil_s.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3249,16 +3154,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADE505BDFBA000CB4B08 /* libxpcom.dylib in Frameworks */, - 4D2998A20869CA5F00E84287 /* libxpcom_core.dylib in Frameworks */, - 3F44ADEA05BDFBA000CB4B08 /* libmozjs.dylib in Frameworks */, - 3F44ADEB05BDFBA000CB4B08 /* libnspr4.dylib in Frameworks */, - 3F44ADEC05BDFBA000CB4B08 /* libplc4.dylib in Frameworks */, - 3F44ADED05BDFBA000CB4B08 /* libplds4.dylib in Frameworks */, - 3F44ADE605BDFBA000CB4B08 /* libembed_base_s.a in Frameworks */, 3F44ADE705BDFBA000CB4B08 /* Cocoa.framework in Frameworks */, - 3F44ADE805BDFBA000CB4B08 /* PreferencePanes.framework in Frameworks */, - 3F44ADE905BDFBA000CB4B08 /* libunicharutil_s.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3266,16 +3162,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADFC05BDFBA000CB4B08 /* libxpcom.dylib in Frameworks */, - 4D2998A50869CA6B00E84287 /* libxpcom_core.dylib in Frameworks */, - 3F44AE0105BDFBA000CB4B08 /* libmozjs.dylib in Frameworks */, - 3F44AE0205BDFBA000CB4B08 /* libnspr4.dylib in Frameworks */, - 3F44AE0305BDFBA000CB4B08 /* libplc4.dylib in Frameworks */, - 3F44AE0405BDFBA000CB4B08 /* libplds4.dylib in Frameworks */, - 3F44ADFD05BDFBA000CB4B08 /* libembed_base_s.a in Frameworks */, 3F44ADFE05BDFBA000CB4B08 /* Cocoa.framework in Frameworks */, - 3F44ADFF05BDFBA000CB4B08 /* PreferencePanes.framework in Frameworks */, - 3F44AE0005BDFBA000CB4B08 /* libunicharutil_s.a in Frameworks */, + 7B479CDA0D0DD6AA00780567 /* libxpcom_core.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4753,8 +4641,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 035A4992079DCA8A0084B05F /* PreferencePaneBase.h in Headers */, 035A498E079DCA100084B05F /* History.h in Headers */, + 7B06E81F0D0DC9580032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4762,8 +4650,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 03C5AB2C07722F8F00EAF77D /* PreferencePaneBase.h in Headers */, 032FFDD4077351D700440548 /* Downloads.h in Headers */, + 7B06E8210D0DC96A0032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4771,8 +4659,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 03E2D86D0771F88C00BD2443 /* PreferencePaneBase.h in Headers */, 03E2D86E0771F89900BD2443 /* Tabs.h in Headers */, + 7B06E8200D0DC9620032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4897,6 +4785,7 @@ 6021CDD90C84FDC4000E7754 /* CHStringBundleOverride.h in Headers */, 337F2BA40CA200D100572F7D /* ContentDispatchChooser.h in Headers */, DE70BE710CBC7CB400C1CC63 /* ToolbarScriptItem.h in Headers */, + 7B06E8140D0DC83B0032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4904,8 +4793,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3F44AD8C05BDFB9F00CB4B08 /* PreferencePaneBase.h in Headers */, 3F44AD8D05BDFB9F00CB4B08 /* Appearance.h in Headers */, + 7B06E8190D0DC9250032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4914,8 +4803,8 @@ buildActionMask = 2147483647; files = ( DE74F75D0AB2605B00FD1D5B /* AppListMenuFactory.h in Headers */, - 3F44ADA205BDFB9F00CB4B08 /* PreferencePaneBase.h in Headers */, 3F44ADA305BDFB9F00CB4B08 /* Navigation.h in Headers */, + 7B06E8180D0DC91A0032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4924,6 +4813,7 @@ buildActionMask = 2147483647; files = ( 3F44ADC505BDFBA000CB4B08 /* PrivacyPane.h in Headers */, + 7B06E81A0D0DC92E0032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4932,6 +4822,7 @@ buildActionMask = 2147483647; files = ( 3F44ADDD05BDFBA000CB4B08 /* SecurityPane.h in Headers */, + 7B06E81E0D0DC9500032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4940,6 +4831,7 @@ buildActionMask = 2147483647; files = ( 3F44ADF405BDFBA000CB4B08 /* WebFeatures.h in Headers */, + 7B06E8220D0DC9720032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5064,6 +4956,7 @@ 6021CDDB0C84FDC4000E7754 /* CHStringBundleOverride.h in Headers */, 337F2BA60CA200D100572F7D /* ContentDispatchChooser.h in Headers */, DE70BE730CBC7CB400C1CC63 /* ToolbarScriptItem.h in Headers */, + 7B06E8150D0DC8800032E38A /* PreferencePaneBase.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5124,9 +5017,9 @@ productReference = 03E2D8530771F73F00BD2443 /* Tabs.prefPane */; productType = "com.apple.product-type.bundle"; }; - 3F44ABD005BDFB9E00CB4B08 /* Camino */ = { + 3F44ABD005BDFB9E00CB4B08 /* CaminoApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 332377840C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "Camino" */; + buildConfigurationList = 332377840C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "CaminoApp" */; buildPhases = ( 3F44ABD705BDFB9E00CB4B08 /* Headers */, 3F44AC2805BDFB9E00CB4B08 /* Resources */, @@ -5148,7 +5041,6 @@ 3F44AD6005BDFB9F00CB4B08 /* Copy Libraries */, 3F44AD6A05BDFB9F00CB4B08 /* Copy Security Components */, 3F44AD6F05BDFB9F00CB4B08 /* Copy Security Chrome */, - 3F44AD7105BDFB9F00CB4B08 /* Copy Preference Panes */, 3F44AD7705BDFB9F00CB4B08 /* Copy Frameworks */, 3365CA1F0D073ECA00ACBF18 /* Scrub Sparkle Languages */, 3F44AD7A05BDFB9F00CB4B08 /* Copy Plugins */, @@ -5158,17 +5050,9 @@ buildRules = ( ); dependencies = ( - 3F44AFD605BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFD805BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFDA05BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFDC05BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFDE05BDFBA100CB4B08 /* PBXTargetDependency */, - 03E2D9900771FB9300BD2443 /* PBXTargetDependency */, - 03C5AB1307722EFC00EAF77D /* PBXTargetDependency */, - 0380F471079DCCD90065A7AB /* PBXTargetDependency */, 7B64B7D20CCFDA1A0098406C /* PBXTargetDependency */, ); - name = Camino; + name = CaminoApp; productInstallPath = "$(HOME)/Applications"; productName = Camino; productReference = 3F44AD8805BDFB9F00CB4B08 /* Camino.app */; @@ -5275,9 +5159,9 @@ productReference = 3F44AE0805BDFBA000CB4B08 /* WebFeatures.prefPane */; productType = "com.apple.product-type.bundle"; }; - 3F44AE0905BDFBA000CB4B08 /* CaminoStatic */ = { + 3F44AE0905BDFBA000CB4B08 /* CaminoStaticApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 332377890C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "CaminoStatic" */; + buildConfigurationList = 332377890C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "CaminoStaticApp" */; buildPhases = ( 3F44AE1005BDFBA000CB4B08 /* Headers */, 3F44AE6105BDFBA000CB4B08 /* Resources */, @@ -5298,7 +5182,6 @@ 3F44AF7505BDFBA000CB4B08 /* Copy Security Libraries */, 3F44AF7B05BDFBA000CB4B08 /* Copy Security Components */, 3F44AF7E05BDFBA000CB4B08 /* Copy Security Chrome */, - 3F44AF8005BDFBA000CB4B08 /* Copy Preference Panes */, 3F44AF8605BDFBA000CB4B08 /* Copy Libraries */, 3F44AF9005BDFBA000CB4B08 /* Copy Frameworks */, 3365CA0F0D07197E00ACBF18 /* Scrub Sparkle Languages */, @@ -5309,17 +5192,9 @@ buildRules = ( ); dependencies = ( - 3F44AFE205BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFE405BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFE605BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFE805BDFBA100CB4B08 /* PBXTargetDependency */, - 3F44AFEA05BDFBA100CB4B08 /* PBXTargetDependency */, - 03C5AB1507722F1100EAF77D /* PBXTargetDependency */, - 03C5AB1707722F1100EAF77D /* PBXTargetDependency */, - 0380F473079DCCEC0065A7AB /* PBXTargetDependency */, 7B64B7D60CCFDA210098406C /* PBXTargetDependency */, ); - name = CaminoStatic; + name = CaminoStaticApp; productInstallPath = "$(HOME)/Applications"; productName = CaminoStatic; productReference = 3F44AFC605BDFBA100CB4B08 /* Camino.app */; @@ -5331,6 +5206,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 3323778E0C4D0F9600A34879 /* Build configuration list for PBXProject "Camino" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; knownRegions = ( English, @@ -5350,16 +5226,18 @@ }, ); targets = ( - 3F44ABD005BDFB9E00CB4B08 /* Camino */, - 3F44AE0905BDFBA000CB4B08 /* CaminoStatic */, - 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */, + 7BDD26CC0D0DC2BA00BA05C6 /* Camino */, + 7BDD26E30D0DC30600BA05C6 /* CaminoStatic */, + 3F44ABD005BDFB9E00CB4B08 /* CaminoApp */, + 3F44AE0905BDFBA000CB4B08 /* CaminoStaticApp */, 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */, + 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */, 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */, 3F44ADDB05BDFBA000CB4B08 /* SecurityPrefPane */, - 3F44ADF205BDFBA000CB4B08 /* WebFeaturesPrefPane */, + 035A4974079DC83D0084B05F /* HistoryPrefPane */, 03E2D8520771F73F00BD2443 /* TabsPrefPane */, 03C5AB0F07722DFC00EAF77D /* DownloadsPrefPane */, - 035A4974079DC83D0084B05F /* HistoryPrefPane */, + 3F44ADF205BDFBA000CB4B08 /* WebFeaturesPrefPane */, ); }; /* End PBXProject section */ @@ -5809,7 +5687,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 035A4999079DCACD0084B05F /* PreferencePaneBase.mm in Sources */, 035A498F079DCA100084B05F /* History.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5818,7 +5695,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 03C5AC3907722FAF00EAF77D /* PreferencePaneBase.mm in Sources */, 032FFDD5077351DA00440548 /* Downloads.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5828,7 +5704,6 @@ buildActionMask = 2147483647; files = ( 03E2D8720771F8EC00BD2443 /* Tabs.mm in Sources */, - 03E2D8730771F8EC00BD2443 /* PreferencePaneBase.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5953,6 +5828,7 @@ 6021CDDA0C84FDC4000E7754 /* CHStringBundleOverride.mm in Sources */, 337F2BA50CA200D100572F7D /* ContentDispatchChooser.mm in Sources */, DE70BE700CBC7CB400C1CC63 /* ToolbarScriptItem.mm in Sources */, + 7B06E8160D0DC8C20032E38A /* PreferencePaneBase.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5960,7 +5836,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3F44AD9505BDFB9F00CB4B08 /* PreferencePaneBase.mm in Sources */, 3F44AD9605BDFB9F00CB4B08 /* Appearance.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5970,7 +5845,6 @@ buildActionMask = 2147483647; files = ( DE74F75F0AB2609400FD1D5B /* AppListMenuFactory.mm in Sources */, - 3F44ADA905BDFB9F00CB4B08 /* PreferencePaneBase.mm in Sources */, 3F44ADAA05BDFB9F00CB4B08 /* Navigation.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5980,7 +5854,6 @@ buildActionMask = 2147483647; files = ( 3F44ADCB05BDFBA000CB4B08 /* PrivacyPane.mm in Sources */, - 3F44ADCC05BDFBA000CB4B08 /* PreferencePaneBase.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5988,7 +5861,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADE205BDFBA000CB4B08 /* PreferencePaneBase.mm in Sources */, 3F44ADE305BDFBA000CB4B08 /* SecurityPane.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5997,7 +5869,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3F44ADF905BDFBA000CB4B08 /* PreferencePaneBase.mm in Sources */, 3F44ADFA05BDFBA000CB4B08 /* WebFeatures.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -6123,92 +5994,13 @@ 6021CDDC0C84FDC4000E7754 /* CHStringBundleOverride.mm in Sources */, 337F2BA70CA200D100572F7D /* ContentDispatchChooser.mm in Sources */, DE70BE720CBC7CB400C1CC63 /* ToolbarScriptItem.mm in Sources */, + 7B06E8170D0DC8DC0032E38A /* PreferencePaneBase.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 0380F471079DCCD90065A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 035A4974079DC83D0084B05F /* HistoryPrefPane */; - targetProxy = 0380F470079DCCD90065A7AB /* PBXContainerItemProxy */; - }; - 0380F473079DCCEC0065A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 035A4974079DC83D0084B05F /* HistoryPrefPane */; - targetProxy = 0380F472079DCCEC0065A7AB /* PBXContainerItemProxy */; - }; - 03C5AB1307722EFC00EAF77D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 03C5AB0F07722DFC00EAF77D /* DownloadsPrefPane */; - targetProxy = 03C5AB1207722EFC00EAF77D /* PBXContainerItemProxy */; - }; - 03C5AB1507722F1100EAF77D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 03E2D8520771F73F00BD2443 /* TabsPrefPane */; - targetProxy = 03C5AB1407722F1100EAF77D /* PBXContainerItemProxy */; - }; - 03C5AB1707722F1100EAF77D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 03C5AB0F07722DFC00EAF77D /* DownloadsPrefPane */; - targetProxy = 03C5AB1607722F1100EAF77D /* PBXContainerItemProxy */; - }; - 03E2D9900771FB9300BD2443 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 03E2D8520771F73F00BD2443 /* TabsPrefPane */; - targetProxy = 03E2D98F0771FB9300BD2443 /* PBXContainerItemProxy */; - }; - 3F44AFD605BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */; - targetProxy = 3F44AFD505BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFD805BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */; - targetProxy = 3F44AFD705BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFDA05BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */; - targetProxy = 3F44AFD905BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFDC05BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADDB05BDFBA000CB4B08 /* SecurityPrefPane */; - targetProxy = 3F44AFDB05BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFDE05BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADF205BDFBA000CB4B08 /* WebFeaturesPrefPane */; - targetProxy = 3F44AFDD05BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFE205BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */; - targetProxy = 3F44AFE105BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFE405BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */; - targetProxy = 3F44AFE305BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFE605BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */; - targetProxy = 3F44AFE505BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFE805BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADDB05BDFBA000CB4B08 /* SecurityPrefPane */; - targetProxy = 3F44AFE705BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; - 3F44AFEA05BDFBA100CB4B08 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F44ADF205BDFBA000CB4B08 /* WebFeaturesPrefPane */; - targetProxy = 3F44AFE905BDFBA100CB4B08 /* PBXContainerItemProxy */; - }; 7B64B7D20CCFDA1A0098406C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Sparkle; @@ -6224,6 +6016,96 @@ name = Sparkle; targetProxy = 7B64B7D90CCFDA280098406C /* PBXContainerItemProxy */; }; + 7BDD26D10D0DC2DE00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ABD005BDFB9E00CB4B08 /* CaminoApp */; + targetProxy = 7BDD26D00D0DC2DE00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26D30D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADF205BDFBA000CB4B08 /* WebFeaturesPrefPane */; + targetProxy = 7BDD26D20D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26D50D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 03C5AB0F07722DFC00EAF77D /* DownloadsPrefPane */; + targetProxy = 7BDD26D40D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26D70D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 03E2D8520771F73F00BD2443 /* TabsPrefPane */; + targetProxy = 7BDD26D60D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26D90D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 035A4974079DC83D0084B05F /* HistoryPrefPane */; + targetProxy = 7BDD26D80D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26DB0D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADDB05BDFBA000CB4B08 /* SecurityPrefPane */; + targetProxy = 7BDD26DA0D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26DD0D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */; + targetProxy = 7BDD26DC0D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26DF0D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */; + targetProxy = 7BDD26DE0D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26E10D0DC2E400BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */; + targetProxy = 7BDD26E00D0DC2E400BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26E80D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADF205BDFBA000CB4B08 /* WebFeaturesPrefPane */; + targetProxy = 7BDD26E70D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26EA0D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 03C5AB0F07722DFC00EAF77D /* DownloadsPrefPane */; + targetProxy = 7BDD26E90D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26EC0D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 03E2D8520771F73F00BD2443 /* TabsPrefPane */; + targetProxy = 7BDD26EB0D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26EE0D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 035A4974079DC83D0084B05F /* HistoryPrefPane */; + targetProxy = 7BDD26ED0D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26F00D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADDB05BDFBA000CB4B08 /* SecurityPrefPane */; + targetProxy = 7BDD26EF0D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26F20D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADC305BDFBA000CB4B08 /* PrivacyPrefPane */; + targetProxy = 7BDD26F10D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26F40D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44AD8A05BDFB9F00CB4B08 /* AppearancePrefPane */; + targetProxy = 7BDD26F30D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26F60D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44ADA005BDFB9F00CB4B08 /* NavigationPrefPane */; + targetProxy = 7BDD26F50D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; + 7BDD26F80D0DC31C00BA05C6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F44AE0905BDFBA000CB4B08 /* CaminoStaticApp */; + targetProxy = 7BDD26F70D0DC31C00BA05C6 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -6618,43 +6500,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, - ../dist/include/xpcom, - ../dist/include/, - ); + HEADER_SEARCH_PATHS = ../dist/include; INFOPLIST_FILE = "Info-AppearancePrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -6669,43 +6516,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, - ../dist/include/xpcom, - ../dist/include/, - ); + HEADER_SEARCH_PATHS = ../dist/include; INFOPLIST_FILE = "Info-AppearancePrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); PRODUCT_NAME = Appearance; }; name = Deployment; @@ -6714,43 +6526,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - HEADER_SEARCH_PATHS = ( - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, - ../dist/include/xpcom, - ../dist/include/, - ); + HEADER_SEARCH_PATHS = ../dist/include; INFOPLIST_FILE = "Info-AppearancePrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); PRODUCT_NAME = Appearance; }; name = DeploymentSymbols; @@ -6760,46 +6537,8 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = sparkle/build/Release; - HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, - ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", - ); + HEADER_SEARCH_PATHS = ../dist/include; INFOPLIST_FILE = "Info-NavigationPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -6815,46 +6554,8 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = sparkle/build/Release; - HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, - ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", - ); + HEADER_SEARCH_PATHS = ../dist/include; INFOPLIST_FILE = "Info-NavigationPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); PRODUCT_NAME = Navigation; }; name = Deployment; @@ -6864,46 +6565,8 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = sparkle/build/Release; - HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, - ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", - ); + HEADER_SEARCH_PATHS = ../dist/include; INFOPLIST_FILE = "Info-NavigationPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); PRODUCT_NAME = Navigation; }; name = DeploymentSymbols; @@ -6912,25 +6575,17 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( - ../dist/include/necko, - ../dist/include/pref, - ../dist/include/nspr, + ../dist/include, ../dist/include/cookie, - ../dist/include/nkcache, + ../dist/include/necko, + ../dist/include/nspr, + ../dist/include/pref, ../dist/include/string, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-PrivacyPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -6945,25 +6600,17 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( - ../dist/include/necko, - ../dist/include/pref, - ../dist/include/nspr, + ../dist/include, ../dist/include/cookie, - ../dist/include/nkcache, + ../dist/include/necko, + ../dist/include/nspr, + ../dist/include/pref, ../dist/include/string, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-PrivacyPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; PRODUCT_NAME = Privacy; }; name = Deployment; @@ -6972,25 +6619,17 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( - ../dist/include/necko, - ../dist/include/pref, - ../dist/include/nspr, + ../dist/include, ../dist/include/cookie, - ../dist/include/nkcache, + ../dist/include/necko, + ../dist/include/nspr, + ../dist/include/pref, ../dist/include/string, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-PrivacyPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; PRODUCT_NAME = Privacy; }; name = DeploymentSymbols; @@ -6999,21 +6638,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( - ../dist/include/pref, + ../dist/include, ../dist/include/nspr, + ../dist/include/pref, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-SecurityPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -7028,21 +6659,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( - ../dist/include/pref, + ../dist/include, ../dist/include/nspr, + ../dist/include/pref, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-SecurityPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); PRODUCT_NAME = Security; }; name = Deployment; @@ -7051,21 +6674,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( - ../dist/include/pref, + ../dist/include, ../dist/include/nspr, + ../dist/include/pref, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-SecurityPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); PRODUCT_NAME = Security; }; name = DeploymentSymbols; @@ -7074,24 +6689,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( + ../dist/include, ../dist/include/necko, - ../dist/include/string, - ../dist/include/cookie, - ../dist/include/pref, ../dist/include/nspr, + ../dist/include/string, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-WebFeaturesPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../dist/Embed\""; OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -7106,24 +6713,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( + ../dist/include, ../dist/include/necko, - ../dist/include/string, - ../dist/include/cookie, - ../dist/include/pref, ../dist/include/nspr, + ../dist/include/string, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-WebFeaturesPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../dist/Embed\""; PRODUCT_NAME = WebFeatures; }; name = Deployment; @@ -7132,24 +6731,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ( + ../dist/include, ../dist/include/necko, - ../dist/include/string, - ../dist/include/cookie, - ../dist/include/pref, ../dist/include/nspr, + ../dist/include/string, ../dist/include/xpcom, - ../dist/include/, ); INFOPLIST_FILE = "Info-WebFeaturesPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/Embed, - ../embedding/base, - ../dist/lib, - ../js/src, - ../dist/Embed/components, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../dist/Embed\""; PRODUCT_NAME = WebFeatures; }; name = DeploymentSymbols; @@ -7159,45 +6750,12 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, + ../dist/include, ../dist/include/dom, ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-TabsPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -7213,45 +6771,12 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, + ../dist/include, ../dist/include/dom, ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-TabsPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); PRODUCT_NAME = Tabs; }; name = Deployment; @@ -7261,45 +6786,12 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, + ../dist/include, ../dist/include/dom, ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-TabsPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); PRODUCT_NAME = Tabs; }; name = DeploymentSymbols; @@ -7309,45 +6801,14 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, + ../dist/include, ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, ../dist/include/xpcom, - ../dist/include/, "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-DownloadsPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../dist/Embed\""; OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-DDEBUG", @@ -7363,45 +6824,14 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, + ../dist/include, ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, ../dist/include/xpcom, - ../dist/include/, "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-DownloadsPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../dist/Embed\""; PRODUCT_NAME = Downloads; }; name = Deployment; @@ -7411,45 +6841,14 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, + ../dist/include, ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, - ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, - ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, ../dist/include/xpcom, - ../dist/include/, "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-DownloadsPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../dist/Embed\""; PRODUCT_NAME = Downloads; }; name = DeploymentSymbols; @@ -7459,45 +6858,17 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, + ../dist/include, ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, + ../dist/include/necko, + ../dist/include/nkcache, + ../dist/include/nspr, ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-HistoryPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../dist/Embed\""; OTHER_CFLAGS = ( "-DDEBUG", "-DMOZ_DEBUG", @@ -7512,45 +6883,17 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, + ../dist/include, ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, + ../dist/include/necko, + ../dist/include/nkcache, + ../dist/include/nspr, ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-HistoryPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../dist/Embed\""; OTHER_CFLAGS = ""; PRODUCT_NAME = History; }; @@ -7561,45 +6904,17 @@ baseConfigurationReference = 332377D10C4D88D300A34879 /* PrefPane.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( - ../dist/include/nkcache, - ../dist/include/webbrwsr, - ../dist/include/dom, - ../dist/include/nspr, - ../dist/include/string, - ../dist/include/rdf, - ../dist/include/necko, - ../dist/include/find, - ../dist/include/embed_base, - ../dist/include/windowwatcher, - ../dist/include/webshell, - ../dist/include/widget, - ../dist/include/uriloader, + ../dist/include, ../dist/include/docshell, - ../dist/include/profile, - ../dist/include/layout, - ../dist/include/content, - ../dist/include/webbrowserpersist, - ../dist/include/pref, - ../dist/include/mimetype, - ../dist/include/shistory, ../dist/include/history, - ../dist/include/view, - ../dist/include/gfx, - ../dist/include/xultmpl, - ../dist/include/xmlextras, - ../dist/include/htmlparser, - ../dist/include/locale, - ../dist/include/unicharutil, - ../dist/include/appcomps, + ../dist/include/necko, + ../dist/include/nkcache, + ../dist/include/nspr, ../dist/include/xpcom, - ../dist/include/, - "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon", ); INFOPLIST_FILE = "Info-HistoryPrefPane.plist"; - LIBRARY_SEARCH_PATHS = ( - ../dist/bin, - ../dist/lib, - ); + LIBRARY_SEARCH_PATHS = ../dist/lib; + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../dist/Embed\""; OTHER_CFLAGS = ""; PRODUCT_NAME = History; }; @@ -7767,6 +7082,62 @@ }; name = DeploymentSymbols; }; + 7BDD26CD0D0DC2BA00BA05C6 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = Camino; + }; + name = Development; + }; + 7BDD26CE0D0DC2BA00BA05C6 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = Camino; + ZERO_LINK = NO; + }; + name = Deployment; + }; + 7BDD26CF0D0DC2BA00BA05C6 /* DeploymentSymbols */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = Camino; + }; + name = DeploymentSymbols; + }; + 7BDD26E40D0DC30700BA05C6 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = CaminoStatic; + }; + name = Development; + }; + 7BDD26E50D0DC30700BA05C6 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PRODUCT_NAME = CaminoStatic; + ZERO_LINK = NO; + }; + name = Deployment; + }; + 7BDD26E60D0DC30700BA05C6 /* DeploymentSymbols */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = CaminoStatic; + }; + name = DeploymentSymbols; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -7850,7 +7221,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; - 332377840C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "Camino" */ = { + 332377840C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "CaminoApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 332377850C4D0F9600A34879 /* Development */, @@ -7860,7 +7231,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; - 332377890C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "CaminoStatic" */ = { + 332377890C4D0F9600A34879 /* Build configuration list for PBXNativeTarget "CaminoStaticApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 3323778A0C4D0F9600A34879 /* Development */, @@ -7880,6 +7251,26 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; + 7BDD26E20D0DC30200BA05C6 /* Build configuration list for PBXAggregateTarget "Camino" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7BDD26CD0D0DC2BA00BA05C6 /* Development */, + 7BDD26CE0D0DC2BA00BA05C6 /* Deployment */, + 7BDD26CF0D0DC2BA00BA05C6 /* DeploymentSymbols */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; + }; + 7BDD26FB0D0DC33B00BA05C6 /* Build configuration list for PBXAggregateTarget "CaminoStatic" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7BDD26E40D0DC30700BA05C6 /* Development */, + 7BDD26E50D0DC30700BA05C6 /* Deployment */, + 7BDD26E60D0DC30700BA05C6 /* DeploymentSymbols */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; + }; /* End XCConfigurationList section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; diff --git a/mozilla/camino/PreferencePanes/Navigation/Navigation.mm b/mozilla/camino/PreferencePanes/Navigation/Navigation.mm index b1bec48b28f..f290c91e02c 100644 --- a/mozilla/camino/PreferencePanes/Navigation/Navigation.mm +++ b/mozilla/camino/PreferencePanes/Navigation/Navigation.mm @@ -38,7 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ -#import #import #import #import diff --git a/mozilla/camino/config/PrefPane.xcconfig b/mozilla/camino/config/PrefPane.xcconfig index 7e9dbc7cf97..5b2493d5d7e 100644 --- a/mozilla/camino/config/PrefPane.xcconfig +++ b/mozilla/camino/config/PrefPane.xcconfig @@ -3,17 +3,17 @@ INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles" GCC_PREFIX_HEADER = src/includes/ChimeraPrefix.h -// Most/all of this will be removed when pref panes switch to bundle linking -// rather than actually compiling any core code. -GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1 -OTHER_LDFLAGS = -lpthread -lm -OTHER_CFLAGS = -fshort-wchar -LIBRARY_STYLE = BUNDLE -GCC_ENABLE_PASCAL_STRINGS = YES GCC_ENABLE_CPP_EXCEPTIONS = NO GCC_ENABLE_CPP_RTTI = NO -// Thes warning settings should be revisited once pref panes aren't tied to core +// Needed because some preference panes still use libxpcom_core.dylib and +// related headers as an internal Mozilla user. +GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1 +OTHER_CFLAGS = -fshort-wchar + GCC_WARN_SIGN_COMPARE = YES WARNING_CFLAGS = -Wall -Wno-four-char-constants OTHER_CPLUSPLUSFLAGS = $(OTHER_CPLUSPLUSFLAGS) -Wno-non-virtual-dtor + +CONFIGURATION_BUILD_DIR = $(BUILD_DIR)/$(CONFIGURATION)/Camino.app/Contents/PreferencePanes +BUNDLE_LOADER = $(BUILD_DIR)/$(CONFIGURATION)/Camino.app/Contents/MacOS/Camino diff --git a/mozilla/camino/PreferencePanes/Shared/PreferencePaneBase.h b/mozilla/camino/src/preferences/PreferencePaneBase.h similarity index 100% rename from mozilla/camino/PreferencePanes/Shared/PreferencePaneBase.h rename to mozilla/camino/src/preferences/PreferencePaneBase.h diff --git a/mozilla/camino/PreferencePanes/Shared/PreferencePaneBase.mm b/mozilla/camino/src/preferences/PreferencePaneBase.mm similarity index 100% rename from mozilla/camino/PreferencePanes/Shared/PreferencePaneBase.mm rename to mozilla/camino/src/preferences/PreferencePaneBase.mm