Merge pull request swiftlang#1008 from daveinglis/new_static_archive_type

Create a common static archive product-type for swiftPM to use

Author: daveinglis

Sources/SWBApplePlatform/Specs/DarwinProductTypes.xcspec

@@ -474,15 +474,4 @@
             com.apple.package-type.mach-o-executable
         );
     },
-    {
-        _Domain = darwin;
-        Type = ProductType;
-        Identifier = org.swift.product-type.common.object;
-        BasedOn = com.apple.product-type.objfile;
-        Class = XCStandaloneExecutableProductType;
-        Description = "Object File";
-        IconNamePrefix = "TargetPlugin";
-        DefaultTargetName = "Object File";
-    },
-
 )

Sources/SWBGenericUnixPlatform/Specs/Unix.xcspec

@@ -81,16 +81,6 @@
         BasedOn = com.apple.product-type.framework;
     },
 
-    {
-        Domain = generic-unix;
-        Type = ProductType;
-        Identifier = org.swift.product-type.common.object;
-        BasedOn = com.apple.product-type.objfile;
-        Class = XCStandaloneExecutableProductType;
-        Description = "Object File";
-        IconNamePrefix = "TargetPlugin";
-        DefaultTargetName = "Object File";
-    },
     {
         Domain = generic-unix;
         Type = FileType;

Sources/SWBUniversalPlatform/Specs/ProductTypes.xcspec

@@ -205,6 +205,23 @@
         );
     },
 
+    {
+        Type = ProductType;
+        Identifier = org.swift.product-type.common.object;
+        BasedOn = com.apple.product-type.objfile;
+        Name = "Mappable Common Object Type";
+        Description = "This type should be used as the top level product type for object files as it may map to different types on different platforms";
+    },
+
+    {
+        Type = ProductType;
+        Identifier = org.swift.product-type.library.static;
+        BasedOn = com.apple.product-type.objfile;
+        Name = "Mappable Common Static Library Type";
+        Description = "This type should be used as the top level product type for static libraries as it may map to different types on different platforms";
+    },
+
+
     //
     // Wrapper product types
     //

Sources/SWBWindowsPlatform/Specs/Windows.xcspec

@@ -114,6 +114,14 @@
         BasedOn = com.apple.product-type.library.static;
     },
 
+    {
+        Domain = windows;
+        Type = ProductType;
+        Identifier = org.swift.product-type.library.static;
+        BasedOn = com.apple.product-type.library.static;
+    },
+
+
     {
         Domain = windows;
         Type = FileType;

Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec

@@ -102,7 +102,7 @@
                 Name = __WINDOWS_STATIC_FLAG;
                 Type = Bool;
                 DefaultValue = YES;
-                Condition = "$(PRODUCT_TYPE) == 'com.apple.product-type.library.static' || $(PRODUCT_TYPE) == 'org.swift.product-type.common.object'";
+                Condition = "$(PRODUCT_TYPE) == 'com.apple.product-type.library.static' || $(PRODUCT_TYPE) == 'org.swift.product-type.library.static' || $(PRODUCT_TYPE) == 'org.swift.product-type.common.object'";
                 CommandLineArgs = ("-static");
             }
         );

Sources/SwiftBuild/ProjectModel/Targets.swift

@@ -310,6 +310,7 @@ extension ProjectModel {
         public enum ProductType: String, Sendable, Codable, CaseIterable {
             case application = "com.apple.product-type.application"
             case staticArchive = "com.apple.product-type.library.static"
+            case commonStaticArchive = "org.swift.product-type.library.static"
             case commonObject = "org.swift.product-type.common.object"
             case objectFile = "com.apple.product-type.objfile"
             case dynamicLibrary = "com.apple.product-type.library.dynamic"