Add SPM support

microsoft · Apr 30, 2020 · 0081eb3 · 0081eb3
1 parent 11f11ca
commit 0081eb3
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 7 deletions.
diff --git a/CrashReporter.xcodeproj/project.pbxproj b/CrashReporter.xcodeproj/project.pbxproj
@@ -1788,7 +1788,6 @@
 			isa = PBXGroup;
 			children = (
 				05CD33520EE9457D000FDE88 /* CrashReporter.exp */,
-				C2620D482451D28B00B11E68 /* CrashReporter.modulemap */,
 				C2F7F26A2451F796002BD8BF /* Default-568h@2x.png */,
 				C2F7F2302451F081002BD8BF /* DemoCrash-iOS-Info.plist */,
 				05F40CE90EF7AB80008050CF /* DemoCrash-macOS-Info.plist */,
@@ -1806,6 +1805,7 @@
 			children = (
 				05CD31890EE93A90000FDE88 /* CrashReporter.h */,
 				05CD318A0EE93A90000FDE88 /* CrashReporter.m */,
+				C2620D482451D28B00B11E68 /* CrashReporter.modulemap */,
 				054F51070EEC73C80034B184 /* PLCrashReporter.h */,
 				05F40ACA0EF7379F008050CF /* PLCrashReporter.m */,
 				05BEC43417BF1CB10082CBFB /* PLCrashReporterConfig.h */,
@@ -3377,7 +3377,7 @@
 				GENERATE_MASTER_OBJECT_FILE = YES;
 				INFOPLIST_FILE = Resources/Info.plist;
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
+				MODULEMAP_FILE = Source/CrashReporter.modulemap;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = iphoneos;
 				SUPPORTS_MACCATALYST = NO;
@@ -3397,7 +3397,7 @@
 				GENERATE_MASTER_OBJECT_FILE = YES;
 				INFOPLIST_FILE = Resources/Info.plist;
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
+				MODULEMAP_FILE = Source/CrashReporter.modulemap;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = iphoneos;
 				SUPPORTS_MACCATALYST = NO;
@@ -3588,7 +3588,7 @@
 				GENERATE_MASTER_OBJECT_FILE = YES;
 				INFOPLIST_FILE = Resources/Info.plist;
 				MACH_O_TYPE = mh_dylib;
-				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
+				MODULEMAP_FILE = Source/CrashReporter.modulemap;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DPLCF_MIN_MACOSX_SDK=$(PL_MIN_MACOSX_SDK)",
@@ -3607,7 +3607,7 @@
 				GENERATE_MASTER_OBJECT_FILE = YES;
 				INFOPLIST_FILE = Resources/Info.plist;
 				MACH_O_TYPE = mh_dylib;
-				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
+				MODULEMAP_FILE = Source/CrashReporter.modulemap;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DPLCF_MIN_MACOSX_SDK=$(PL_MIN_MACOSX_SDK)",
@@ -3724,7 +3724,7 @@
 				GENERATE_MASTER_OBJECT_FILE = YES;
 				INFOPLIST_FILE = Resources/Info.plist;
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
+				MODULEMAP_FILE = Source/CrashReporter.modulemap;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = appletvos;
 			};
@@ -3741,7 +3741,7 @@
 				GENERATE_MASTER_OBJECT_FILE = YES;
 				INFOPLIST_FILE = Resources/Info.plist;
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
+				MODULEMAP_FILE = Source/CrashReporter.modulemap;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = appletvos;
 			};

diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,28 @@
+// swift-tools-version:5.0
+
+import PackageDescription
+
+let package = Package(
+    name: "PLCrashReporter",
+    products: [
+        .library(name: "CrashReporter", targets: ["CrashReporter"])
+    ],
+    targets: [
+        .target(
+            name: "CrashReporter",
+            path: "",
+            exclude: ["*Tests.m*"],
+            sources: [
+                "Source",
+                "Dependencies"
+            ],
+            cSettings: [
+                .define("PLCR_PRIVATE"),
+                .define("PLCF_RELEASE_BUILD")
+            ],
+            linkerSettings: [
+                .linkedFramework("Foundation")
+            ]
+        )
+    ]
+)
diff --git a/Resources/CrashReporter.modulemap → Source/CrashReporter.modulemap b/Resources/CrashReporter.modulemap → Source/CrashReporter.modulemap
diff --git a/include/CrashReporter.h b/include/CrashReporter.h
@@ -0,0 +1 @@
+../Source/CrashReporter.h
diff --git a/include/PLCrashFeatureConfig.h b/include/PLCrashFeatureConfig.h
@@ -0,0 +1 @@
+../Source/PLCrashFeatureConfig.h
diff --git a/include/PLCrashMacros.h b/include/PLCrashMacros.h
@@ -0,0 +1 @@
+../Source/PLCrashMacros.h
diff --git a/include/PLCrashNamespace.h b/include/PLCrashNamespace.h
@@ -0,0 +1 @@
+../Source/PLCrashNamespace.h
diff --git a/include/PLCrashReport.h b/include/PLCrashReport.h
@@ -0,0 +1 @@
+../Source/PLCrashReport.h
diff --git a/include/PLCrashReportApplicationInfo.h b/include/PLCrashReportApplicationInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportApplicationInfo.h
diff --git a/include/PLCrashReportBinaryImageInfo.h b/include/PLCrashReportBinaryImageInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportBinaryImageInfo.h
diff --git a/include/PLCrashReportExceptionInfo.h b/include/PLCrashReportExceptionInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportExceptionInfo.h
diff --git a/include/PLCrashReportFormatter.h b/include/PLCrashReportFormatter.h
@@ -0,0 +1 @@
+../Source/PLCrashReportFormatter.h
diff --git a/include/PLCrashReportMachExceptionInfo.h b/include/PLCrashReportMachExceptionInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportMachExceptionInfo.h
diff --git a/include/PLCrashReportMachineInfo.h b/include/PLCrashReportMachineInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportMachineInfo.h
diff --git a/include/PLCrashReportProcessInfo.h b/include/PLCrashReportProcessInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportProcessInfo.h
diff --git a/include/PLCrashReportProcessorInfo.h b/include/PLCrashReportProcessorInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportProcessorInfo.h
diff --git a/include/PLCrashReportRegisterInfo.h b/include/PLCrashReportRegisterInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportRegisterInfo.h
diff --git a/include/PLCrashReportSignalInfo.h b/include/PLCrashReportSignalInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportSignalInfo.h
diff --git a/include/PLCrashReportStackFrameInfo.h b/include/PLCrashReportStackFrameInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportStackFrameInfo.h
diff --git a/include/PLCrashReportSymbolInfo.h b/include/PLCrashReportSymbolInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportSymbolInfo.h
diff --git a/include/PLCrashReportSystemInfo.h b/include/PLCrashReportSystemInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportSystemInfo.h
diff --git a/include/PLCrashReportTextFormatter.h b/include/PLCrashReportTextFormatter.h
@@ -0,0 +1 @@
+../Source/PLCrashReportTextFormatter.h
diff --git a/include/PLCrashReportThreadInfo.h b/include/PLCrashReportThreadInfo.h
@@ -0,0 +1 @@
+../Source/PLCrashReportThreadInfo.h
diff --git a/include/PLCrashReporter.h b/include/PLCrashReporter.h
@@ -0,0 +1 @@
+../Source/PLCrashReporter.h
diff --git a/include/PLCrashReporterConfig.h b/include/PLCrashReporterConfig.h
@@ -0,0 +1 @@
+../Source/PLCrashReporterConfig.h