Skip to content

Commit f2edb1c

Browse files
authored
Merge pull request #502 from swiftlang/owenv/shell-escaping
2 parents ed66ddc + 921cbbc commit f2edb1c

28 files changed

+26
-25
lines changed

Sources/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ function(SwiftBuild_Bundle)
2323
COMMAND
2424
${CMAKE_COMMAND} -E copy_if_different ${BundleXCSpecs_FILES} "${CMAKE_BINARY_DIR}/share/pm/SwiftBuild_${BundleXCSpecs_MODULE}.resources/")
2525

26+
2627
file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/share/pm/SwiftBuild_${BundleXCSpecs_MODULE}.resources" _SWIFT_BUILD_RESOURCE_BUNDLE_BUILD_PATH)
2728
file(CONFIGURE
2829
OUTPUT "${CMAKE_BINARY_DIR}/resource_accessors/SwiftBuild_${BundleXCSpecs_MODULE}_resource_bundle_accessor.swift"

Sources/SWBApplePlatform/CMakeLists.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ SwiftBuild_Bundle(MODULE SWBApplePlatform FILES
5353
Specs/CompileSkybox.xcspec
5454
Specs/CopyPNGFile.xcspec
5555
Specs/CopyTiffFile.xcspec
56-
"Specs/Core Data.xcspec"
56+
Specs/CoreData.xcspec
5757
Specs/CoreML.xcspec
58-
"Specs/Darwin Package Types.xcspec"
59-
"Specs/Darwin Product Types.xcspec"
58+
Specs/DarwinPackageTypes.xcspec
59+
Specs/DarwinProductTypes.xcspec
6060
Specs/DriverKit.xcspec
6161
Specs/DTrace.xcspec
6262
Specs/Embedded-Device.xcspec
@@ -75,18 +75,18 @@ SwiftBuild_Bundle(MODULE SWBApplePlatform FILES
7575
Specs/InfoPlistUtility.xcspec
7676
Specs/InstrumentsPackage.xcspec
7777
Specs/Intents.xcspec
78-
"Specs/Interface Builder File Types.xcspec"
79-
"Specs/iOS Device.xcspec"
80-
"Specs/iOS Shared.xcspec"
81-
"Specs/iOS Simulator.xcspec"
78+
Specs/InterfaceBuilderFileTypes.xcspec
79+
Specs/iOSDevice.xcspec
80+
Specs/iOSShared.xcspec
81+
Specs/iOSSimulator.xcspec
8282
Specs/KernelExtension.xcspec
8383
Specs/Lipo.xcspec
8484
Specs/LSRegisterURL.xcspec
85-
"Specs/MacOSX Architectures.xcspec"
86-
"Specs/MacOSX Core Build System.xcspec"
87-
"Specs/MacOSX Native Build System.xcspec"
88-
"Specs/MacOSX Package Types.xcspec"
89-
"Specs/MacOSX Product Types.xcspec"
85+
Specs/macOSArchitectures.xcspec
86+
Specs/macOSCoreBuildSystem.xcspec
87+
Specs/macOSNativeBuildSystem.xcspec
88+
Specs/macOSPackageTypes.xcspec
89+
Specs/macOSProductTypes.xcspec
9090
Specs/MetalCompiler.xcspec
9191
Specs/MetalFileTypes.xcspec
9292
Specs/MetalLinker.xcspec
@@ -100,22 +100,22 @@ SwiftBuild_Bundle(MODULE SWBApplePlatform FILES
100100
Specs/ReferenceObject.xcspec
101101
Specs/ResMerger.xcspec
102102
Specs/Rez.xcspec
103-
"Specs/SceneKit FileTypes.xcspec"
104-
"Specs/SceneKit Tools.xcspec"
103+
Specs/SceneKitFileTypes.xcspec
104+
Specs/SceneKitTools.xcspec
105105
Specs/SpriteKitFileTypes.xcspec
106106
Specs/TiffUtil.xcspec
107-
"Specs/tvOS Device.xcspec"
108-
"Specs/tvOS Shared.xcspec"
109-
"Specs/tvOS Simulator.xcspec"
107+
Specs/tvOSDevice.xcspec
108+
Specs/tvOSShared.xcspec
109+
Specs/tvOSSimulator.xcspec
110110
Specs/WatchKit1ProductTypes.xcspec
111-
"Specs/watchOS Device.xcspec"
112-
"Specs/watchOS Shared.xcspec"
113-
"Specs/watchOS Simulator.xcspec"
111+
Specs/watchOSDevice.xcspec
112+
Specs/watchOSShared.xcspec
113+
Specs/watchOSSimulator.xcspec
114114
Specs/XCAppExtensionPoints.xcspec
115115
Specs/XCStrings.xcspec
116-
"Specs/xrOS Device.xcspec"
117-
"Specs/xrOS Shared.xcspec"
118-
"Specs/xrOS Simulator.xcspec")
116+
Specs/xrOSDevice.xcspec
117+
Specs/xrOSShared.xcspec
118+
Specs/xrOSSimulator.xcspec)
119119
set_target_properties(SWBApplePlatform PROPERTIES
120120
Swift_LANGUAGE_VERSION 6)
121121
target_link_libraries(SWBApplePlatform PUBLIC

0 commit comments

Comments
 (0)