Skip to content

Commit 8d91971

Browse files
committed
[PlaygroundSupport] Removed a couple of vestigial shell script build phases for copying swiftdoc files.
These were added before Xcode's build system supported copying swiftdoc files on its own. They've been harmless for the last several years, but because they hard-coded `x86_64`, it means they don't work when building PlaygroundSupport.framework (or the legacy XCPlayground.framework) for `arm64` only. As a result, this commit removes these vestigial build phases; Xcode's built-in support for swiftdoc files is better than these ever were. This addresses <rdar://problem/75513867>.
1 parent 35d729b commit 8d91971

File tree

1 file changed

+1
-30
lines changed

1 file changed

+1
-30
lines changed

PlaygroundSupport/PlaygroundSupport.xcodeproj/project.pbxproj

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@
592592
1DF4117018DCB596001CDFC7 /* Frameworks */,
593593
1DF4117218DCB596001CDFC7 /* Headers */,
594594
1DF4117318DCB596001CDFC7 /* Resources */,
595-
5EB831EE19247927007D5493 /* Copy swiftdoc */,
596595
);
597596
buildRules = (
598597
);
@@ -631,7 +630,6 @@
631630
A8318F921CF603630015809A /* Sources */,
632631
A8318F981CF603630015809A /* Frameworks */,
633632
A8318F9A1CF603630015809A /* Resources */,
634-
A8318F9C1CF603630015809A /* Copy swiftdoc */,
635633
);
636634
buildRules = (
637635
);
@@ -878,6 +876,7 @@
878876
developmentRegion = English;
879877
hasScannedForEncodings = 0;
880878
knownRegions = (
879+
English,
881880
en,
882881
);
883882
mainGroup = 1D7FD51118BFE00400C718C6;
@@ -1009,34 +1008,6 @@
10091008
shellPath = /bin/sh;
10101009
shellScript = "swiftc -v";
10111010
};
1012-
5EB831EE19247927007D5493 /* Copy swiftdoc */ = {
1013-
isa = PBXShellScriptBuildPhase;
1014-
buildActionMask = 2147483647;
1015-
files = (
1016-
);
1017-
inputPaths = (
1018-
);
1019-
name = "Copy swiftdoc";
1020-
outputPaths = (
1021-
);
1022-
runOnlyForDeploymentPostprocessing = 0;
1023-
shellPath = /bin/bash;
1024-
shellScript = "# Copy x86_64's swiftdoc from the object file dir to the target build dir.\nsrc_swiftdoc=\"${OBJECT_FILE_DIR_normal}/x86_64/${PRODUCT_MODULE_NAME}.swiftdoc\"\ndst_swiftdoc=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Modules/${PRODUCT_MODULE_NAME}.swiftmodule/x86_64.swiftdoc\"\n\necho \"Copying swiftdoc for XCPlayground.framework\"\ncp -v \"${src_swiftdoc}\" \"${dst_swiftdoc}\"";
1025-
};
1026-
A8318F9C1CF603630015809A /* Copy swiftdoc */ = {
1027-
isa = PBXShellScriptBuildPhase;
1028-
buildActionMask = 2147483647;
1029-
files = (
1030-
);
1031-
inputPaths = (
1032-
);
1033-
name = "Copy swiftdoc";
1034-
outputPaths = (
1035-
);
1036-
runOnlyForDeploymentPostprocessing = 0;
1037-
shellPath = /bin/bash;
1038-
shellScript = "# Copy x86_64's swiftdoc from the object file dir to the target build dir.\nsrc_swiftdoc=\"${OBJECT_FILE_DIR_normal}/x86_64/${PRODUCT_MODULE_NAME}.swiftdoc\"\ndst_swiftdoc=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Modules/${PRODUCT_MODULE_NAME}.swiftmodule/x86_64.swiftdoc\"\n\necho \"Copying swiftdoc for XCPlayground.framework\"\ncp -v \"${src_swiftdoc}\" \"${dst_swiftdoc}\"";
1039-
};
10401011
/* End PBXShellScriptBuildPhase section */
10411012

10421013
/* Begin PBXSourcesBuildPhase section */

0 commit comments

Comments
 (0)