SDK: add SDK overlay for Windows #20906
Conversation
|
I figure you may have some words on the location of the file. Thanks to @gottesmm for reminding me to do the right thing and make things feel more natural. This is going to enable a bunch of additional tests. |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test Linux platform |
| public let FALSE: BOOL = 0 | ||
|
|
||
| // minwindef.h | ||
| public let TRUE: BOOL = 1 |
There was a problem hiding this comment.
Oh boy, Windows has a BOOL too? Do we want to pull an ObjCBool on it eventually? (WindowsBoolean?)
There was a problem hiding this comment.
Ah, I see https://bugs.swift.org/browse/SR-9383.
There was a problem hiding this comment.
The world of the 90s was a terrible place. Yes, unfortunately, I think that we will want to pull an ObjCBool on it.
There was a problem hiding this comment.
At least we've done it twice already (ObjCBool and DarwinBoolean), which means we're past the ZOM threshold.
There was a problem hiding this comment.
WindowsBool sounds nice to me.
stdlib/public/CMakeLists.txt
Outdated
| @@ -72,3 +72,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | |||
| add_subdirectory(SDK) | |||
| endif() | |||
| endif() | |||
|
|
|||
| if(WINDOWS IN_LIST SWIFT_SDKS) | |||
| add_subdirectory(SDK/Windows) | |||
There was a problem hiding this comment.
lol, thats why I wanted you to review this :) This is getting into the territory of difficult things ... naming. How about changing the structure to SDK/Darwin and SDK/Windows? Or Apple/ and Microsoft/?
There was a problem hiding this comment.
I think "OS family" is the right grouping here, so "SDK/Darwin/" and "SDK/Windows/" is closer to the right thing, but then I don't think the SDK/ subfolder is buying us anything. I personally don't like using "Darwin" to mean "Apple platforms" these days because it's Yet Another Term and also doesn't line up with the LLVM "x86_64-apple-darwin" triple that only means macOS (Mac OS X) and not iOS or anything else. So my names would be "Apple/" and "Windows/", but "Darwin/" and "Windows/" would be okay too.
There was a problem hiding this comment.
FWIW – The only other name for "Darwin" that covers all of Apple's operating systems is "xnu" (the kernel). It is near impossible to build an xnu-based platform without dragging along a ton of "Darwin" frameworks and daemons due to various reentrant dependancies.
There was a problem hiding this comment.
@davezarzycki - haha, perhaps we should call it "XNU/Darwin" (mirroring "GNU/Linux") :-p I'm going to go with Darwin for now I think.
|
CC: @davezarzycki, not sure if you care, but this is probably going to be fun! |
|
Hi @compnerd – I'm not concerned about the SDK overlays at the moment, but thanks for the heads up. |
compnerd
force-pushed
the
sdk-overlay
branch
from
cfb64a3
to
aec17be
Compare
|
@swift-ci please test |
|
Build failed |
compnerd
force-pushed
the
sdk-overlay
branch
from
aec17be
to
d4db363
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
cc also @Rostepher, since we build things directly from stdlib/public/SDK/. He may want you to hold off on renaming that to Apple/ just now. |
Introduce a WinSDK overlay for Windows. This allows us to define some shared constants that are not correctly imported right now. This cleans up the logic in the swift side of things and aids in the bring up. Now that we have a SDK overlay for Windows, we should structure the tree according to the OS family.
|
Split out the SDK rename, I'll upload a separate change for that. |
|
@swift-ci please test and merge |
|
(test and merge hit the force push issue... just making it run). |
|
@swift-ci please test and merge |
1 similar comment
|
@swift-ci please test and merge |
Introduce a WinSDK overlay for Windows. This allows us to define some
shared constants that are not correctly imported right now. This cleans
up the logic in the swift side of things and aids in the bring up.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.