Merge pull request #2949 from abertelrud/eng/packagedesc-swiftdoc-is-missing-on-darwin

abertelrud · web-flow · commit e0791b340346 · 2020-09-25T00:02:37.000-07:00
The PackageDescription.swiftdoc file is missing on Darwin
diff --git a/Sources/PackageDescription/CMakeLists.txt b/Sources/PackageDescription/CMakeLists.txt
@@ -57,6 +57,7 @@ foreach(PACKAGE_DESCRIPTION_VERSION 4 4_2)
     if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
         install(FILES
             ${CMAKE_BINARY_DIR}/pm/${PACKAGE_DESCRIPTION_VERSION}/PackageDescription.swiftinterface
+            ${CMAKE_BINARY_DIR}/pm/${PACKAGE_DESCRIPTION_VERSION}/PackageDescription.swiftdoc
             DESTINATION lib/swift/pm/${PACKAGE_DESCRIPTION_VERSION}
         )
     else()
diff --git a/Utilities/bootstrap b/Utilities/bootstrap
@@ -389,7 +389,7 @@ def install_swiftpm(prefix, args):
             files_to_install.append("PackageDescription.swiftinterface")
         else:
             files_to_install.append("PackageDescription.swiftmodule")
-            files_to_install.append("PackageDescription.swiftdoc")
+        files_to_install.append("PackageDescription.swiftdoc")
 
         for file in files_to_install:
             src = os.path.join(runtime_lib_src, runtime, file)

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ foreach(PACKAGE_DESCRIPTION_VERSION 4 4_2)`
`57`	`57`	`if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)`
`58`	`58`	`install(FILES`
`59`	`59`	`${CMAKE_BINARY_DIR}/pm/${PACKAGE_DESCRIPTION_VERSION}/PackageDescription.swiftinterface`
	`60`	`+ ${CMAKE_BINARY_DIR}/pm/${PACKAGE_DESCRIPTION_VERSION}/PackageDescription.swiftdoc`
`60`	`61`	`DESTINATION lib/swift/pm/${PACKAGE_DESCRIPTION_VERSION}`
`61`	`62`	`)`
`62`	`63`	`else()`