Skip to content

Become a proper Swift Package #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkcoxson merged 1 commit into from
Jun 20, 2022
Merged

Become a proper Swift Package #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Swift Package Manager
Package.resolved

# macOS
#
*.DS_Store
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "Dependencies/OpenSSL"]
path = Dependencies/OpenSSL
url = https://github.com/rileytestut/OpenSSL
[submodule "Dependencies/ldid"]
path = Dependencies/ldid
url = https://github.com/rileytestut/ldid.git
1 change: 0 additions & 1 deletion Dependencies/OpenSSL
Open in desktop
Submodule OpenSSL deleted from d0afc3
28 changes: 17 additions & 11 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,31 @@ let package = Package(
.macOS(.v10_14),
],
products: [
.library(
/*.library(
name: "AltSign-Dynamic",
type: .dynamic,
targets: ["AltSign", "CAltSign", "CoreCrypto", "CCoreCrypto", "ldid", "ldid-core", "OpenSSL"]
),
targets: ["AltSign", "CAltSign", "CoreCrypto", "CCoreCrypto", "ldid", "ldid-core"]
),*/
.library(
name: "AltSign-Static",
name: "AltSign",
//type: .static,
targets: ["AltSign", "CAltSign", "CoreCrypto", "CCoreCrypto", "ldid", "ldid-core"]
),
],
dependencies: [],

dependencies: [
.package(url: "https://github.com/krzyzanowskim/OpenSSL.git", .upToNextMinor(from: "1.1.180"))
],

targets: [
.binaryTarget(
/*.binaryTarget(
name: "OpenSSL",
path: "Dependencies/OpenSSL/Frameworks/OpenSSL.xcframework"
),
),*/

.target(
name: "ldid-core",
dependencies: ["OpenSSL"],
path: "Dependencies/ldid",
exclude: [
"ldid.hpp",
Expand Down Expand Up @@ -77,7 +83,7 @@ let package = Package(
.headerSearchPath("libplist/include"),
.headerSearchPath("libplist/src"),
.headerSearchPath("libplist/libcnary/include"),
.headerSearchPath("../OpenSSL/ios/include"),
// .headerSearchPath("../OpenSSL/ios/include"),
]
),
.target(
Expand All @@ -96,7 +102,7 @@ let package = Package(
.headerSearchPath("../../Dependencies/ldid/libplist/include"),
.headerSearchPath("../../Dependencies/ldid/libplist/src"),
.headerSearchPath("../../Dependencies/ldid/libplist/libcnary/include"),
.headerSearchPath("../../Dependencies/OpenSSL/ios/include"),
// .headerSearchPath("../../Dependencies/OpenSSL/ios/include"),
]
),

Expand Down Expand Up @@ -137,7 +143,7 @@ let package = Package(
"AltSign/include/module.modulemap",
"Dependencies/corecrypto",
"Dependencies/ldid",
"Dependencies/OpenSSL",
// "Dependencies/OpenSSL",
"Dependencies/minizip/iowin32.c",
"Dependencies/minizip/Makefile",
"Dependencies/minizip/minizip.c",
Expand All @@ -150,7 +156,7 @@ let package = Package(
.headerSearchPath("AltSign/ldid"),
.headerSearchPath("Dependencies/minizip"),
.headerSearchPath("AltSign/Capabilities"),
.headerSearchPath("Dependencies/OpenSSL/ios/include"),
// .headerSearchPath("Dependencies/OpenSSL/ios/include"),
.headerSearchPath("Dependencies/ldid/libplist/include"),
.headerSearchPath("Dependencies/ldid"),
.define("unix=1"),
Expand Down