From b19f5b974307a1d02169cecc787ceca2e44b0a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= Date: Sun, 27 Mar 2022 01:15:08 +0400 Subject: [PATCH 1/5] Fix error in log message in Makefile ios task --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 143ea7444..4ad14ecf6 100644 --- a/Makefile +++ b/Makefile @@ -299,7 +299,7 @@ vendor: rm -r vendor/; go mod vendor ios: vendor mobile-rpc - @$(call print, "Building iOS framework ($(IOS_BUILD)).") + @$(call print, "Building iOS cxframework ($(IOS_BUILD)).") mkdir -p $(IOS_BUILD_DIR) $(GOMOBILE_BIN) bind -target=ios -tags="mobile $(DEV_TAGS) autopilotrpc" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) From f015d885e47d8386448cb2e901ebed260edd7aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= Date: Sun, 27 Mar 2022 01:19:37 +0400 Subject: [PATCH 2/5] mobile: Add macos Makefile task for compiling xcframework for macOS --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 4ad14ecf6..cad728c36 100644 --- a/Makefile +++ b/Makefile @@ -303,6 +303,11 @@ ios: vendor mobile-rpc mkdir -p $(IOS_BUILD_DIR) $(GOMOBILE_BIN) bind -target=ios -tags="mobile $(DEV_TAGS) autopilotrpc" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) +macos: vendor mobile-rpc + @$(call print, "Building macOS cxframework ($(IOS_BUILD)).") + mkdir -p $(IOS_BUILD_DIR) + $(GOMOBILE_BIN) bind -target=macos -tags="mobile $(DEV_TAGS) autopilotrpc" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) + android: vendor mobile-rpc @$(call print, "Building Android library ($(ANDROID_BUILD)).") mkdir -p $(ANDROID_BUILD_DIR) From a97b194574b33027611439f73d3fe9b359d97687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= Date: Sun, 27 Mar 2022 01:20:30 +0400 Subject: [PATCH 3/5] mobile: Add apple Makefile task for compiling xcframework for all Apple platforms --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index cad728c36..7c6e84a07 100644 --- a/Makefile +++ b/Makefile @@ -298,6 +298,11 @@ vendor: @$(call print, "Re-creating vendor directory.") rm -r vendor/; go mod vendor +apple: vendor mobile-rpc + @$(call print, "Building iOS and macOS cxframework ($(IOS_BUILD)).") + mkdir -p $(IOS_BUILD_DIR) + $(GOMOBILE_BIN) bind -target=ios,iossimulator,macos -tags="mobile $(DEV_TAGS) autopilotrpc" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) + ios: vendor mobile-rpc @$(call print, "Building iOS cxframework ($(IOS_BUILD)).") mkdir -p $(IOS_BUILD_DIR) From cc21ae15024c7a8ff91dfe28a89d94f6bd5583a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= Date: Sun, 27 Mar 2022 02:26:49 +0400 Subject: [PATCH 4/5] Add info about `macos` and `apple` Makefile tasks to 0.15.0 release notes --- docs/release-notes/release-notes-0.15.0.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/release-notes/release-notes-0.15.0.md b/docs/release-notes/release-notes-0.15.0.md index bab8a0a2b..483b70327 100644 --- a/docs/release-notes/release-notes-0.15.0.md +++ b/docs/release-notes/release-notes-0.15.0.md @@ -120,6 +120,15 @@ then watch it on chain. Taproot script spends are also supported through the specifies the maximum duration it allows for a remote peer to respond to a locally initiated commitment update. +* [`macos` and `apple` Makefile tasks have been added.](https://github.com/lightningnetwork/lnd/pull/6373) + + The `macos` task uses `gomobile` to build an `XCFramework` that can be used to + embed lnd to macOS apps, similar to how the `ios` task builds for iOS. + + The `apple` task uses `gomobile` to build an `XCFramework` that can be used to + embed lnd to both iOS and macOS apps. + + ## RPC Server * [Add value to the field @@ -213,6 +222,7 @@ gRPC performance metrics (latency to process `GetInfo`, etc)](https://github.com * Daniel McNally * ErikEk * Eugene Siegel +* Hampus Sjöberg * henta * Joost Jager * Jordi Montes From 1786fdf4d4682bc0ef2ce6b96ff7bbe93d8539f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hampus=20Sj=C3=B6berg?= Date: Thu, 31 Mar 2022 12:09:37 +0400 Subject: [PATCH 5/5] mobile: Add iossimulator gomobile target to ios Makefile task --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7c6e84a07..eeacf7f1e 100644 --- a/Makefile +++ b/Makefile @@ -306,7 +306,7 @@ apple: vendor mobile-rpc ios: vendor mobile-rpc @$(call print, "Building iOS cxframework ($(IOS_BUILD)).") mkdir -p $(IOS_BUILD_DIR) - $(GOMOBILE_BIN) bind -target=ios -tags="mobile $(DEV_TAGS) autopilotrpc" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) + $(GOMOBILE_BIN) bind -target=ios,iossimulator -tags="mobile $(DEV_TAGS) autopilotrpc" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) macos: vendor mobile-rpc @$(call print, "Building macOS cxframework ($(IOS_BUILD)).")