From 7642e2f7638bfeab6925aa2d459dff9cc6a6924b Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Fri, 28 Jun 2024 16:30:23 -0700 Subject: [PATCH 1/3] Update Windows/Android installer scripts for swift-foundation re-core --- platforms/Windows/android_sdk/android_sdk.wxs | 697 +++++++++++++++++- platforms/Windows/rtl/lib/rtllib.wxs | 9 + platforms/Windows/sdk/sdk.wxs | 697 +++++++++++++++++- 3 files changed, 1391 insertions(+), 12 deletions(-) diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs index b607d8e5..91155349 100644 --- a/platforms/Windows/android_sdk/android_sdk.wxs +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -73,6 +73,8 @@ + + @@ -92,6 +94,9 @@ + + + @@ -223,6 +228,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -359,12 +1006,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -373,10 +1053,10 @@ - + - + @@ -385,10 +1065,10 @@ - + - + @@ -527,6 +1207,8 @@ + + @@ -536,6 +1218,9 @@ + + + diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs index 9513726d..4d25f936 100644 --- a/platforms/Windows/rtl/lib/rtllib.wxs +++ b/platforms/Windows/rtl/lib/rtllib.wxs @@ -74,6 +74,15 @@ + + + + + + + + + diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 302583d7..2e660b85 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -71,6 +71,8 @@ + + @@ -89,6 +91,9 @@ + + + @@ -224,6 +229,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -335,12 +982,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -349,10 +1029,10 @@ - + - + @@ -361,10 +1041,10 @@ - + - + @@ -530,6 +1210,8 @@ + + @@ -538,6 +1220,9 @@ + + + From a53a40f827a9636fdd901f5495dddc9675524759 Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Fri, 12 Jul 2024 20:12:48 -0700 Subject: [PATCH 2/3] _FoundationCollections is a combined module not files in an arch-specific dir --- platforms/Windows/android_sdk/android_sdk.wxs | 4 ++-- platforms/Windows/sdk/sdk.wxs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs index 91155349..810f97db 100644 --- a/platforms/Windows/android_sdk/android_sdk.wxs +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -1008,10 +1008,10 @@ - + - + diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 2e660b85..4b50973a 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -984,10 +984,10 @@ - + - + From 251247b783531298d1a9839e0e4c912d1486b33b Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Fri, 12 Jul 2024 22:48:06 -0700 Subject: [PATCH 3/3] _FoundationCollections is named by ArchArchDir not ArchTriple --- platforms/Windows/android_sdk/android_sdk.wxs | 4 ++-- platforms/Windows/sdk/sdk.wxs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs index 810f97db..e4fd0884 100644 --- a/platforms/Windows/android_sdk/android_sdk.wxs +++ b/platforms/Windows/android_sdk/android_sdk.wxs @@ -1008,10 +1008,10 @@ - + - + diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 4b50973a..ea1856d6 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -984,10 +984,10 @@ - + - +