Skip to content

Commit c638c15

Browse files
committed
chore: remove status-go mobile build logic
Move status-go build logic from mobile scripts to status-go repo. - #18377
1 parent 1f1b653 commit c638c15

File tree

4 files changed

+13
-62
lines changed

4 files changed

+13
-62
lines changed

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,19 @@ export STATUSGO_LIBDIR
475475
$(STATUSGO): | deps status-go-deps
476476
echo -e $(BUILD_MSG) "status-go"
477477
# FIXME: Nix shell usage breaks builds due to Glibc mismatch.
478+
ifeq ($(filter $(mkspecs),android ios),$(mkspecs))
479+
$(MAKE) -C vendor/status-go statusgo-mobile-library SHELL=/bin/sh \
480+
OS=$(mkspecs) \
481+
ARCH=$(ARCH) \
482+
IPHONE_SDK=$(IPHONE_SDK) \
483+
IOS_TARGET=$(IOS_TARGET) \
484+
$(STATUSGO_MAKE_PARAMS) $(HANDLE_OUTPUT)
485+
else
478486
$(MAKE) -C vendor/status-go statusgo-shared-library SHELL=/bin/sh \
479487
SENTRY_CONTEXT_NAME="status-desktop" \
480488
SENTRY_CONTEXT_VERSION="$(DESKTOP_VERSION)" \
481489
$(STATUSGO_MAKE_PARAMS) $(HANDLE_OUTPUT)
490+
endif
482491

483492
status-go: $(STATUSGO)
484493

@@ -906,7 +915,7 @@ mobile-run: deps-common
906915
echo -e "\033[92mRunning:\033[39m mobile app"
907916
$(MAKE) -C mobile run
908917

909-
mobile-build: | deps-common
918+
mobile-build: | deps-common status-go
910919
echo -e "\033[92mBuilding:\033[39m mobile app"
911920
$(MAKE) -C mobile
912921

mobile/Makefile

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,14 @@ iosdevice: IPHONE_SDK=iphoneos
99
iosdevice: default
1010

1111
# dependencies
12-
status-go: clean-status-go $(STATUS_GO_LIB)
1312
statusq: clean-statusq $(STATUS_Q_LIB)
1413
dotherside: clean-dotherside $(DOTHERSIDE_LIB)
1514
openssl: clean-openssl $(OPENSSL_LIB)
1615
qrcodegen: clean-qrcodegen $(QRCODEGEN_LIB)
1716
nim-status-client: clean-nim-status-client $(NIM_STATUS_CLIENT_LIB)
1817
status-desktop-rcc: clean-status-desktop-rcc $(STATUS_DESKTOP_RCC)
1918

20-
$(STATUS_GO_LIB): $(STATUS_GO_FILES) $(STATUS_GO_SCRIPT)
21-
@echo "Building Status Go"
22-
ifeq ($(OS),ios)
23-
@STATUS_GO=$(STATUS_GO) \
24-
CC="$(shell xcrun --sdk ${SDK} --find clang)" \
25-
CGO_CFLAGS="-arch ${ARCH} -isysroot $(shell xcrun --sdk ${IPHONE_SDK} --show-sdk-path) -miphoneos-version-min=${IOS_TARGET} -fembed-bitcode" \
26-
$(STATUS_GO_SCRIPT) $(HANDLE_OUTPUT)
27-
else
28-
@STATUS_GO=$(STATUS_GO) $(STATUS_GO_SCRIPT) $(HANDLE_OUTPUT)
29-
endif
30-
@echo "Status Go built $(STATUS_GO_LIB)"
19+
STATUS_GO_LIB := ../vendor/status-go/build/bin/libstatus.$(LIB_EXT)
3120

3221
$(STATUS_Q_LIB): $(STATUS_Q_FILES) $(STATUS_Q_SCRIPT) $(STATUS_Q_UI_FILES)
3322
@echo "Building StatusQ"
@@ -73,7 +62,7 @@ makedir:
7362
all: $(TARGET)
7463

7564
.PHONY: clean
76-
clean: clean-status-go clean-statusq clean-dotherside clean-openssl clean-qrcodegen clean-nim-status-client clean-status-desktop-rcc
65+
clean: clean-statusq clean-dotherside clean-openssl clean-qrcodegen clean-nim-status-client clean-status-desktop-rcc
7766
@echo "Cleaning"
7867
@rm -rf $(ROOT_DIR)/bin $(ROOT_DIR)/build $(ROOT_DIR)/lib
7968

@@ -82,11 +71,6 @@ run: makedir $(TARGET)
8271
@echo "Running"
8372
@APP=$(TARGET) QT_MAJOR=$(QT_MAJOR) USE_QML_SERVER=$(USE_QML_SERVER) $(RUN_SCRIPT)
8473

85-
.PHONY: clean-status-go
86-
clean-status-go:
87-
@rm -f $(STATUS_GO_LIB)
88-
@rm -rf $(STATUS_GO)/build
89-
9074
.PHONY: clean-statusq
9175
clean-statusq:
9276
@rm -f $(STATUS_Q_LIB)

mobile/scripts/buildStatusGo.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

vendor/status-go

Submodule status-go updated 52 files

0 commit comments

Comments
 (0)