From 1d719f914a76434c4181b357e43c0242efb52f29 Mon Sep 17 00:00:00 2001 From: Dmitry Bespalov Date: Fri, 9 Aug 2019 17:30:19 +0200 Subject: [PATCH 1/5] Updated secp256k1 to master --- secp256k1/Classes/secp256k1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secp256k1/Classes/secp256k1 b/secp256k1/Classes/secp256k1 index fa33017..786dfb4 160000 --- a/secp256k1/Classes/secp256k1 +++ b/secp256k1/Classes/secp256k1 @@ -1 +1 @@ -Subproject commit fa3301713549d118e57ebe6551d062903ddd6b63 +Subproject commit 786dfb49f539f7ea56c80792c3cca6a90590f3f4 From 43bb7f4e4cfa6317272c50b9dae4e88e53e258c0 Mon Sep 17 00:00:00 2001 From: Dmitry Bespalov Date: Tue, 3 Sep 2019 09:16:13 +0200 Subject: [PATCH 2/5] added modulemap --- .gitignore | 1 + Package.swift | 9 ++++----- include/module.modulemap | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 include/module.modulemap diff --git a/.gitignore b/.gitignore index b957ede..6da6412 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Xcode build/ +.build/ *.pbxuser !default.pbxuser *.mode1v3 diff --git a/Package.swift b/Package.swift index 7a87e75..3f80a0e 100644 --- a/Package.swift +++ b/Package.swift @@ -40,23 +40,22 @@ let package = Package( "secp256k1/src/bench.h", "secp256k1/src/modules/ecdh/tests_impl.h", "secp256k1/src/modules/recovery/tests_impl.h", - + "secp256k1/contrib", "exporter" ], sources: [ ".", "secp256k1/src", "secp256k1/include", - "secp256k1/contrib", "secp256k1/modules/ecdh", "secp256k1/modules/recovery" ], publicHeadersPath: "secp256k1/include", cSettings: [ .define("HAVE_CONFIG_H"), - .headerSearchPath("./secp256k1/Classes/secp256k1"), - .headerSearchPath("./secp256k1/Classes/secp256k1/src"), - .headerSearchPath("./secp256k1/Classes") + .headerSearchPath("secp256k1"), + .headerSearchPath("secp256k1/src"), + .headerSearchPath(".") ]), .target( name: "secp256k1", diff --git a/include/module.modulemap b/include/module.modulemap new file mode 100644 index 0000000..ad8d044 --- /dev/null +++ b/include/module.modulemap @@ -0,0 +1,6 @@ +module libsecp256k1 { + header "secp256k1.h" + header "secp256k1_ecdh.h" + header "secp256k1_recovery.h" + header "secp256k1_preallocated.h" +} From fb1fd52082d51e4ac0dceca04df401e27b6fadb5 Mon Sep 17 00:00:00 2001 From: Dmitry Bespalov Date: Mon, 9 Sep 2019 12:09:35 +0200 Subject: [PATCH 3/5] update package --- Package.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 3f80a0e..50d964d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.1 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -18,7 +18,7 @@ let package = Package( // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( - name: "libsecp256k1", + name: "secp256k1", path: "./secp256k1/Classes", exclude: [ "secp256k1/build-aux", @@ -57,10 +57,10 @@ let package = Package( .headerSearchPath("secp256k1/src"), .headerSearchPath(".") ]), - .target( - name: "secp256k1", - dependencies: ["libsecp256k1"], - path: "./secp256k1/Classes/exporter", - sources: ["."]) +// .target( +// name: "secp256k1", +// dependencies: ["libsecp256k1"], +// path: "./secp256k1/Classes/exporter", +// sources: ["."]) ] ) From f6e093e6552709a81762749c0759e914335480cf Mon Sep 17 00:00:00 2001 From: Dmitry Bespalov Date: Mon, 9 Sep 2019 12:54:29 +0200 Subject: [PATCH 4/5] gitignor --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6da6412..8184b46 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # OS X .DS_Store +.swiftpm/ # Xcode build/ From 07e169e2b18f614d6b761d945c40d2028bceece6 Mon Sep 17 00:00:00 2001 From: Dmitry Bespalov Date: Mon, 30 Sep 2019 14:17:58 +0200 Subject: [PATCH 5/5] remove commented lines --- Package.swift | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 50d964d..0ebecf0 100644 --- a/Package.swift +++ b/Package.swift @@ -56,11 +56,6 @@ let package = Package( .headerSearchPath("secp256k1"), .headerSearchPath("secp256k1/src"), .headerSearchPath(".") - ]), -// .target( -// name: "secp256k1", -// dependencies: ["libsecp256k1"], -// path: "./secp256k1/Classes/exporter", -// sources: ["."]) + ]) ] )