Skip to content

Commit 729d64b

Browse files
darinadlerdarinadler
committed
Convert WebKit WebExtension ARC code to unified source compiling
rdar://160949824 https://bugs.webkit.org/show_bug.cgi?id=299190 Reviewed by Timothy Hatcher and Keith Miller. Added support to make separate unified source files for ARC and non-ARC Objective-C++ code. Used it in WebKit for extensions ARC code. * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: Renamed unified source files to use -nonARC.mm suffix. * Source/JavaScriptCore/Scripts/generate-unified-sources.sh: Update for new non-ARC category. * Source/JavaScriptCore/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. * Source/JavaScriptCore/UnifiedSources-output.xcfilelist: Renamed unified source files to use -nonARC.mm suffix. * Source/JavaScriptCore/inspector/remote/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. * Source/WTF/Scripts/generate-unified-source-bundles.rb: Added support for separate ARC and non-ARC Objective-C++ sources. * Source/WebCore/Scripts/generate-unified-sources.sh: Update for new non-ARC category. * Source/WebCore/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. * Source/WebCore/UnifiedSources-output.xcfilelist: Renamed unified source files to use -nonARC.mm suffix. * Source/WebCore/WebCore.xcodeproj/project.pbxproj: Renamed unified source files to use -nonARC.mm suffix. * Source/WebKit/Platform/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. * Source/WebKit/Scripts/generate-unified-sources.sh: Update for new non-ARC category. * Source/WebKit/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. Added the WebExtensions source files. * Source/WebKit/UnifiedSources-output.xcfilelist: Renamed unified source files to use -nonARC.mm suffix. Added the new files with the -ARC.mm suffix. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: Renamed unified source files to use -nonARC.mm suffix. Added new unified source files with the -ARC.mm suffix. Turned off compilation of all the individual WebExtension source file that are now compiled in unified sources. * Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPICommandsCocoa.mm: (WebKit::toAPI): (WebKit::WebExtensionContextProxy::dispatchCommandsChangedEvent): * Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPICookiesCocoa.mm: (WebKit::toWebAPI): (WebKit::WebExtensionAPICookies::parseCookieDetails): (WebKit::WebExtensionAPICookies::get): (WebKit::WebExtensionAPICookies::set): (WebKit::WebExtensionAPICookies::remove): * Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIMenusCocoa.mm: (WebKit::WebExtensionAPIMenus::parseCreateAndUpdateProperties): (WebKit::WebExtensionContextProxy::dispatchMenusClickedEvent): * Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIScriptingCocoa.mm: (WebKit::toWebAPI): (WebKit::WebExtensionAPIScripting::parseCSSInjectionOptions): (WebKit::WebExtensionAPIScripting::parseRegisteredContentScripts): * Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIWebRequestCocoa.mm: (WebKit::webRequestDetailsForResourceLoad): (WebKit::convertHeaderFieldsToWebExtensionFormat): (WebKit::WebExtensionContextProxy::resourceLoadDidCompleteWithError): * Source/WebKit/WebProcess/Extensions/Cocoa/_WKWebExtensionWebNavigationURLFilter.mm: (-[_WKWebExtensionWebNavigationURLFilter initWithDictionary:outErrorMessage:]): * Source/WebKit/WebProcess/Extensions/Cocoa/_WKWebExtensionWebRequestFilter.mm: (-[_WKWebExtensionWebRequestFilter initWithDictionary:outErrorMessage:]): (-[_WKWebExtensionWebRequestFilter _initializeWithDictionary:]): Use @"" directly instead of named @"" constants to sidestep issue with duplicate versions of the same string constant. * Source/WebKitLegacy/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. * Source/WebKitLegacy/UnifiedSources-output.xcfilelist: Renamed unified source files to use -nonARC.mm suffix. * Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj: Renamed unified source files to use -nonARC.mm suffix. * Source/WebKitLegacy/scripts/generate-unified-sources.sh: Update for new non-ARC category. * Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh: Update for new non-ARC category. * Tools/TestWebKitAPI/SourcesCocoa.txt: Added @NonArc to all the non-ARC Objective-C++ source files. * Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Renamed unified source files to use -nonARC.mm suffix. * Tools/TestWebKitAPI/UnifiedSources-output.xcfilelist: Renamed unified source files to use -nonARC.mm suffix. Canonical link: https://commits.webkit.org/300647@main
1 parent 44bf3ef commit 729d64b

30 files changed

Lines changed: 2952 additions & 2968 deletions

‎Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,9 +1002,9 @@
10021002
52F6C35E1E71EB080081F4CC /* WebAssemblyWrapperFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 52F6C35C1E71EB080081F4CC /* WebAssemblyWrapperFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
10031003
52FDABC32788076B00C15B59 /* WasmIRGeneratorHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 52FDABC22788076900C15B59 /* WasmIRGeneratorHelpers.h */; };
10041004
53091F9A2ABE1F570076CBC4 /* WasmIPIntSlowPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = 53091F982ABE1F570076CBC4 /* WasmIPIntSlowPaths.h */; };
1005-
530A66B91FA3E78B0026A545 /* UnifiedSource3-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B11FA3E77A0026A545 /* UnifiedSource3-mm.mm */; };
1006-
530A66BA1FA3E78B0026A545 /* UnifiedSource4-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B81FA3E77E0026A545 /* UnifiedSource4-mm.mm */; };
1007-
530A66BB1FA3E78B0026A545 /* UnifiedSource5-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B51FA3E77D0026A545 /* UnifiedSource5-mm.mm */; };
1005+
530A66B91FA3E78B0026A545 /* UnifiedSource3-nonARC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B11FA3E77A0026A545 /* UnifiedSource3-nonARC.mm */; };
1006+
530A66BA1FA3E78B0026A545 /* UnifiedSource4-nonARC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B81FA3E77E0026A545 /* UnifiedSource4-nonARC.mm */; };
1007+
530A66BB1FA3E78B0026A545 /* UnifiedSource5-nonARC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B51FA3E77D0026A545 /* UnifiedSource5-nonARC.mm */; };
10081008
530A66BC1FA3E78B0026A545 /* UnifiedSource137.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B21FA3E77B0026A545 /* UnifiedSource137.cpp */; };
10091009
530A66BD1FA3E78B0026A545 /* UnifiedSource138.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B41FA3E77C0026A545 /* UnifiedSource138.cpp */; };
10101010
530A66BE1FA3E78B0026A545 /* UnifiedSource139.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530A66AE1FA3E7780026A545 /* UnifiedSource139.cpp */; };
@@ -1181,8 +1181,8 @@
11811181
536B318E1F71C5990037FC33 /* UnifiedSource128.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 536B31091F71C5380037FC33 /* UnifiedSource128.cpp */; };
11821182
536B318F1F71C5990037FC33 /* UnifiedSource114.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 536B310A1F71C5380037FC33 /* UnifiedSource114.cpp */; };
11831183
536B31901F71C5990037FC33 /* UnifiedSource100.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 536B310B1F71C5380037FC33 /* UnifiedSource100.cpp */; };
1184-
536B319A1F735E780037FC33 /* UnifiedSource1-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 536B31981F735E5C0037FC33 /* UnifiedSource1-mm.mm */; };
1185-
536B319B1F735E780037FC33 /* UnifiedSource2-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 536B31961F735E5B0037FC33 /* UnifiedSource2-mm.mm */; };
1184+
536B319A1F735E780037FC33 /* UnifiedSource1-nonARC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 536B31981F735E5C0037FC33 /* UnifiedSource1-nonARC.mm */; };
1185+
536B319B1F735E780037FC33 /* UnifiedSource2-nonARC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 536B31961F735E5B0037FC33 /* UnifiedSource2-nonARC.mm */; };
11861186
536B319C1F735E7D0037FC33 /* UnifiedSource134.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 536B31971F735E5B0037FC33 /* UnifiedSource134.cpp */; };
11871187
536B319D1F735E7D0037FC33 /* UnifiedSource135.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 536B31991F735E5D0037FC33 /* UnifiedSource135.cpp */; };
11881188
5370806B1FE232DF00299E44 /* JSArrayBufferView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2B66BB17B6B5AB00A7AE3F /* JSArrayBufferView.h */; };
@@ -4219,14 +4219,14 @@
42194219
530A66AE1FA3E7780026A545 /* UnifiedSource139.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource139.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource139.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
42204220
530A66AF1FA3E7790026A545 /* UnifiedSource141.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource141.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource141.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
42214221
530A66B01FA3E77A0026A545 /* UnifiedSource145.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource145.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource145.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
4222-
530A66B11FA3E77A0026A545 /* UnifiedSource3-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource3-mm.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource3-mm.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
4222+
530A66B11FA3E77A0026A545 /* UnifiedSource3-nonARC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource3-nonARC.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource3-nonARC.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
42234223
530A66B21FA3E77B0026A545 /* UnifiedSource137.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource137.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource137.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
42244224
530A66B31FA3E77C0026A545 /* UnifiedSource140.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource140.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource140.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
42254225
530A66B41FA3E77C0026A545 /* UnifiedSource138.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource138.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource138.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
4226-
530A66B51FA3E77D0026A545 /* UnifiedSource5-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource5-mm.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource5-mm.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
4226+
530A66B51FA3E77D0026A545 /* UnifiedSource5-nonARC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource5-nonARC.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource5-nonARC.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
42274227
530A66B61FA3E77D0026A545 /* UnifiedSource142.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource142.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource142.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
42284228
530A66B71FA3E77D0026A545 /* UnifiedSource143.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource143.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource143.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
4229-
530A66B81FA3E77E0026A545 /* UnifiedSource4-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource4-mm.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource4-mm.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
4229+
530A66B81FA3E77E0026A545 /* UnifiedSource4-nonARC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource4-nonARC.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource4-nonARC.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
42304230
530A66CC1FB1346D0026A545 /* SuperSamplerBytecodeScope.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SuperSamplerBytecodeScope.h; sourceTree = "<group>"; };
42314231
530F0A962AE0606900A0EEC0 /* LazyValueProfile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LazyValueProfile.h; sourceTree = "<group>"; };
42324232
530F0A972AE0606900A0EEC0 /* LazyValueProfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LazyValueProfile.cpp; sourceTree = "<group>"; };
@@ -4417,9 +4417,9 @@
44174417
536B31091F71C5380037FC33 /* UnifiedSource128.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource128.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource128.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
44184418
536B310A1F71C5380037FC33 /* UnifiedSource114.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource114.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource114.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
44194419
536B310B1F71C5380037FC33 /* UnifiedSource100.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource100.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource100.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
4420-
536B31961F735E5B0037FC33 /* UnifiedSource2-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource2-mm.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource2-mm.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
4420+
536B31961F735E5B0037FC33 /* UnifiedSource2-nonARC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource2-nonARC.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource2-nonARC.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
44214421
536B31971F735E5B0037FC33 /* UnifiedSource134.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource134.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource134.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
4422-
536B31981F735E5C0037FC33 /* UnifiedSource1-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource1-mm.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource1-mm.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
4422+
536B31981F735E5C0037FC33 /* UnifiedSource1-nonARC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource1-nonARC.mm"; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource1-nonARC.mm"; sourceTree = BUILT_PRODUCTS_DIR; };
44234423
536B31991F735E5D0037FC33 /* UnifiedSource135.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource135.cpp; path = "DerivedSources/JavaScriptCore/unified-sources/UnifiedSource135.cpp"; sourceTree = BUILT_PRODUCTS_DIR; };
44244424
536B319F1F7369BD0037FC33 /* glib */ = {isa = PBXFileReference; lastKnownFileType = folder; path = glib; sourceTree = "<group>"; };
44254425
5370B4F31BF25EA2005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AdaptiveInferredPropertyValueWatchpointBase.cpp; sourceTree = "<group>"; };
@@ -7692,19 +7692,19 @@
76927692
isa = PBXGroup;
76937693
children = (
76947694
E32F713A281B3C6600AFD21D /* UnifiedSource1-c.c */,
7695-
536B31981F735E5C0037FC33 /* UnifiedSource1-mm.mm */,
7695+
536B31981F735E5C0037FC33 /* UnifiedSource1-nonARC.mm */,
76967696
536B30DA1F71C5380037FC33 /* UnifiedSource1.cpp */,
76977697
E32F713C281B3C6600AFD21D /* UnifiedSource2-c.c */,
7698-
536B31961F735E5B0037FC33 /* UnifiedSource2-mm.mm */,
7698+
536B31961F735E5B0037FC33 /* UnifiedSource2-nonARC.mm */,
76997699
536B30D21F71C5380037FC33 /* UnifiedSource2.cpp */,
77007700
E32F713B281B3C6600AFD21D /* UnifiedSource3-c.c */,
7701-
530A66B11FA3E77A0026A545 /* UnifiedSource3-mm.mm */,
7701+
530A66B11FA3E77A0026A545 /* UnifiedSource3-nonARC.mm */,
77027702
536B30D31F71C5380037FC33 /* UnifiedSource3.cpp */,
77037703
E32F7139281B3C6600AFD21D /* UnifiedSource4-c.c */,
7704-
530A66B81FA3E77E0026A545 /* UnifiedSource4-mm.mm */,
7704+
530A66B81FA3E77E0026A545 /* UnifiedSource4-nonARC.mm */,
77057705
536B30E11F71C5380037FC33 /* UnifiedSource4.cpp */,
77067706
E32F7138281B3C6600AFD21D /* UnifiedSource5-c.c */,
7707-
530A66B51FA3E77D0026A545 /* UnifiedSource5-mm.mm */,
7707+
530A66B51FA3E77D0026A545 /* UnifiedSource5-nonARC.mm */,
77087708
536B30E21F71C5380037FC33 /* UnifiedSource5.cpp */,
77097709
536B30EA1F71C5380037FC33 /* UnifiedSource6.cpp */,
77107710
536B30E91F71C5380037FC33 /* UnifiedSource7.cpp */,
@@ -13445,19 +13445,19 @@
1344513445
4B46940428984FEE00512FDF /* MacroAssemblerX86_64.cpp in Sources */,
1344613446
FE770390298CD40F009634C7 /* Parser.cpp in Sources */,
1344713447
E32F713F281B3C6600AFD21D /* UnifiedSource1-c.c in Sources */,
13448-
536B319A1F735E780037FC33 /* UnifiedSource1-mm.mm in Sources */,
13448+
536B319A1F735E780037FC33 /* UnifiedSource1-nonARC.mm in Sources */,
1344913449
536B315F1F71C5990037FC33 /* UnifiedSource1.cpp in Sources */,
1345013450
E32F7141281B3C6600AFD21D /* UnifiedSource2-c.c in Sources */,
13451-
536B319B1F735E780037FC33 /* UnifiedSource2-mm.mm in Sources */,
13451+
536B319B1F735E780037FC33 /* UnifiedSource2-nonARC.mm in Sources */,
1345213452
536B31571F71C5990037FC33 /* UnifiedSource2.cpp in Sources */,
1345313453
E32F7140281B3C6600AFD21D /* UnifiedSource3-c.c in Sources */,
13454-
530A66B91FA3E78B0026A545 /* UnifiedSource3-mm.mm in Sources */,
13454+
530A66B91FA3E78B0026A545 /* UnifiedSource3-nonARC.mm in Sources */,
1345513455
536B31581F71C5990037FC33 /* UnifiedSource3.cpp in Sources */,
1345613456
E32F713E281B3C6600AFD21D /* UnifiedSource4-c.c in Sources */,
13457-
530A66BA1FA3E78B0026A545 /* UnifiedSource4-mm.mm in Sources */,
13457+
530A66BA1FA3E78B0026A545 /* UnifiedSource4-nonARC.mm in Sources */,
1345813458
536B31661F71C5990037FC33 /* UnifiedSource4.cpp in Sources */,
1345913459
E32F713D281B3C6600AFD21D /* UnifiedSource5-c.c in Sources */,
13460-
530A66BB1FA3E78B0026A545 /* UnifiedSource5-mm.mm in Sources */,
13460+
530A66BB1FA3E78B0026A545 /* UnifiedSource5-nonARC.mm in Sources */,
1346113461
536B31671F71C5990037FC33 /* UnifiedSource5.cpp in Sources */,
1346213462
536B316F1F71C5990037FC33 /* UnifiedSource6.cpp in Sources */,
1346313463
536B316E1F71C5990037FC33 /* UnifiedSource7.cpp in Sources */,

‎Source/JavaScriptCore/Scripts/generate-unified-sources.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ fi
1616

1717
UnifiedSourceCppFileCount=165
1818
UnifiedSourceCFileCount=5
19-
UnifiedSourceMmFileCount=5
19+
UnifiedSourceMmFileCount=0
20+
UnifiedSourceNonARCMmFileCount=5
2021

2122
if [ $# -eq 0 ]; then
2223
echo "Using unified source list files: Sources.txt, SourcesCocoa.txt, inspector/remote/SourcesCocoa.txt"
2324
fi
2425

25-
/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-c-bundle-count ${UnifiedSourceCFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt inspector/remote/SourcesCocoa.txt "${ARGS[@]}" > /dev/null
26-
26+
/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-c-bundle-count ${UnifiedSourceCFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} --max-non-arc-obj-c-bundle-count ${UnifiedSourceNonARCMmFileCount} Sources.txt SourcesCocoa.txt inspector/remote/SourcesCocoa.txt "${ARGS[@]}" > /dev/null

‎Source/JavaScriptCore/SourcesCocoa.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2222
// THE POSSIBILITY OF SUCH DAMAGE.
2323

24-
API/JSAPIGlobalObject.mm
25-
API/JSAPIWrapperObject.mm
26-
API/JSScript.mm
27-
API/JSScriptSourceProvider.mm
28-
API/JSContext.mm
29-
API/JSManagedValue.mm
24+
API/JSAPIGlobalObject.mm @nonARC
25+
API/JSAPIWrapperObject.mm @nonARC
26+
API/JSScript.mm @nonARC
27+
API/JSScriptSourceProvider.mm @nonARC
28+
API/JSContext.mm @nonARC
29+
API/JSManagedValue.mm @nonARC
3030
API/JSRemoteInspector.cpp
3131
API/JSStringRefCF.cpp
32-
API/JSValue.mm
33-
API/JSVirtualMachine.mm
34-
API/JSWrapperMap.mm
35-
API/ObjCCallbackFunction.mm
32+
API/JSValue.mm @nonARC
33+
API/JSVirtualMachine.mm @nonARC
34+
API/JSWrapperMap.mm @nonARC
35+
API/ObjCCallbackFunction.mm @nonARC
3636
API/PASReportCrashPrivate.cpp
3737

3838
// Use inspector/remote/SourcesCocoa.txt for Remote Inspector files

‎Source/JavaScriptCore/UnifiedSources-output.xcfilelist‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is generated by the generate-xcfilelists script.
22
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource1-c.c
3-
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource1-mm.mm
3+
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource1-nonARC.mm
44
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource1.cpp
55
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource10.cpp
66
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource100.cpp
@@ -79,7 +79,7 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSourc
7979
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource18.cpp
8080
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource19.cpp
8181
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource2-c.c
82-
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource2-mm.mm
82+
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource2-nonARC.mm
8383
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource2.cpp
8484
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource20.cpp
8585
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource21.cpp
@@ -92,7 +92,7 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSourc
9292
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource28.cpp
9393
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource29.cpp
9494
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource3-c.c
95-
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource3-mm.mm
95+
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource3-nonARC.mm
9696
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource3.cpp
9797
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource30.cpp
9898
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource31.cpp
@@ -105,7 +105,7 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSourc
105105
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource38.cpp
106106
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource39.cpp
107107
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource4-c.c
108-
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource4-mm.mm
108+
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource4-nonARC.mm
109109
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource4.cpp
110110
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource40.cpp
111111
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource41.cpp
@@ -118,7 +118,7 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSourc
118118
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource48.cpp
119119
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource49.cpp
120120
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource5-c.c
121-
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource5-mm.mm
121+
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource5-nonARC.mm
122122
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource5.cpp
123123
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource50.cpp
124124
$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/unified-sources/UnifiedSource51.cpp

0 commit comments

Comments
 (0)