From d386fe11c89e96901dd64b843564105e6b01cb78 Mon Sep 17 00:00:00 2001 From: JJTech Date: Mon, 20 Jun 2022 14:37:33 -0400 Subject: [PATCH] Become a proper Swift package --- .gitignore | 3 +++ .gitmodules | 3 --- Dependencies/OpenSSL | 1 - Package.swift | 28 +++++++++++++++++----------- 4 files changed, 20 insertions(+), 15 deletions(-) delete mode 160000 Dependencies/OpenSSL diff --git a/.gitignore b/.gitignore index 6703d61..3e51af1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Swift Package Manager +Package.resolved + # macOS # *.DS_Store diff --git a/.gitmodules b/.gitmodules index 81b5365..a773446 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Dependencies/OpenSSL b/Dependencies/OpenSSL deleted file mode 160000 index d0afc3f..0000000 --- a/Dependencies/OpenSSL +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0afc3f44f5a0fbc52e08ef12d9d10f8ad9677b4 diff --git a/Package.swift b/Package.swift index 439d365..0f1cf0d 100644 --- a/Package.swift +++ b/Package.swift @@ -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", @@ -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( @@ -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"), ] ), @@ -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", @@ -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"),