[SDK] Adjust dependency script & regenerate dependencies

[lorentey]

The overlay dependencies are a bit out date with the SDKs that are in Xcode 11 beta 1, and this causes CI issues. Adjust the script to reduce the amount of noise it generates and regenerate overlay dependencies.

rdar://problem/51634433

[lorentey]

@swift-ci clean test

[swift-ci]

Build failed
Swift Test OS X Platform
Git Sha - 329872fadbd74569e2afa426975590478a99e4c7

[benlangmuir]

@swift-ci clean test macOS

[swift-ci]

Build failed
Swift Test OS X Platform
Git Sha - 329872fadbd74569e2afa426975590478a99e4c7

[jrose-apple]

Make sure you do the generation against the internal SDKs. Better to have too many dependencies than not enough.

[lorentey]

11281 failures are a few more than I expected.

[lorentey]

@swift-ci clean test macOS platform

[lorentey]

@swift-ci test

[lorentey]

@swift-ci clean test

[swift-ci]

Build failed
Swift Test OS X Platform
Git Sha - 304500655fbcb15fb54f5d643818524fdaa210b1

[lorentey]

That was slightly too many additions -- we have two cycles now:

Dispatch → os → Dispatch
ObjectiveC → os → ObjectiveC

CMake Error: The inter-target dependency graph contains the following strongly connected component (cycle):
  "swiftDispatch-swiftmodule-iphonesimulator-i386" of type UTILITY
    depends on "lib-swift-iphonesimulator-Dispatch.swiftmodule-i386.swiftmodule" (strong)
  "lib-swift-iphonesimulator-Dispatch.swiftmodule-i386.swiftmodule" of type UTILITY
    depends on "swiftObjectiveC-swiftmodule-iphonesimulator-i386" (strong)
    depends on "swiftos-swiftmodule-iphonesimulator-i386" (strong)
  "swiftObjectiveC-swiftmodule-iphonesimulator-i386" of type UTILITY
    depends on "lib-swift-iphonesimulator-ObjectiveC.swiftmodule-i386.swiftmodule" (strong)
  "lib-swift-iphonesimulator-ObjectiveC.swiftmodule-i386.swiftmodule" of type UTILITY
    depends on "swiftos-swiftmodule-iphonesimulator-i386" (strong)
  "swiftos-swiftmodule-iphonesimulator-i386" of type UTILITY
    depends on "lib-swift-iphonesimulator-os.swiftmodule-i386.swiftmodule" (strong)
  "lib-swift-iphonesimulator-os.swiftmodule-i386.swiftmodule" of type UTILITY
    depends on "swiftDispatch-swiftmodule-iphonesimulator-i386" (strong)
    depends on "swiftObjectiveC-swiftmodule-iphonesimulator-i386" (strong)

[jrose-apple]

Hm, ObjectiveC definitely shouldn't depend on os. And I think os depend on Dispatch but not the other way around.

[benlangmuir]

@jrose-apple did you mean Dispatch depends on os?

<snip>/usr/include/dispatch/dispatch.h:
26:#include <os/availability.h>
28:#include <os/base.h>
30:#include <os/generic_win_base.h>
32:#include <os/generic_unix_base.h>
59:#include <os/object.h>

[jrose-apple]

No, os.object and os.base were broken out into their own modules to break this circularity.

module os [system] [extern_c] {
 module base {
  export Darwin.os.base
 }
 module lock {
  export Darwin.os.lock
 }
 module object {
  export os_object
 }
 // ...
}

[lorentey]

Rebased and reverted back to the public SDK.

@swift-ci test