status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: remove status-go from desktop

This commit is contained in:
Richard Ramos 2021-09-23 15:07:06 -04:00 committed by Iuri Matias
parent c9319c3968
commit 5c937a28a3
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule "vendor/nimbus-build-system"] [submodule "vendor/nimbus-build-system"]
path = vendor/nimbus-build-system path = vendor/nimbus-build-system
url = https://github.com/status-im/nimbus-build-system.git url = https://github.com/status-im/nimbus-build-system.git
[submodule "vendor/status-go"]
path = vendor/status-go
url = https://github.com/status-im/status-go.git
[submodule "vendor/DOtherSide"] [submodule "vendor/DOtherSide"]
path = vendor/DOtherSide path = vendor/DOtherSide
url = https://github.com/status-im/DOtherSide.git url = https://github.com/status-im/DOtherSide.git

6
Makefile
View File

@ -207,14 +207,14 @@ $(DOTHERSIDE): | deps
.. $(HANDLE_OUTPUT) && \ .. $(HANDLE_OUTPUT) && \
$(DOTHERSIDE_BUILD_CMD) $(DOTHERSIDE_BUILD_CMD)
STATUSGO := vendor/status-go/build/bin/libstatus.$(LIBSTATUS_EXT) STATUSGO := vendor/status-lib/vendor/status-go/build/bin/libstatus.$(LIBSTATUS_EXT)
STATUSGO_LIBDIR := $(shell pwd)/$(shell dirname "$(STATUSGO)") STATUSGO_LIBDIR := $(shell pwd)/$(shell dirname "$(STATUSGO)")
export STATUSGO_LIBDIR export STATUSGO_LIBDIR
status-go: $(STATUSGO) status-go: $(STATUSGO)
$(STATUSGO): | deps $(STATUSGO): | deps
echo -e $(BUILD_MSG) "status-go" echo -e $(BUILD_MSG) "status-go"
+ cd vendor/status-go && \ + cd vendor/status-lib/vendor/status-go && \
$(MAKE) statusgo-shared-library $(HANDLE_OUTPUT) $(MAKE) statusgo-shared-library $(HANDLE_OUTPUT)
QRCODEGEN := vendor/QR-Code-generator/c/libqrcodegen.a QRCODEGEN := vendor/QR-Code-generator/c/libqrcodegen.a
@ -353,7 +353,7 @@ $(STATUS_CLIENT_APPIMAGE): nim_status_client $(APPIMAGE_TOOL) nim-status.desktop
cp -P /usr/lib/x86_64-linux-gnu/libgst* tmp/linux/dist/usr/lib/ cp -P /usr/lib/x86_64-linux-gnu/libgst* tmp/linux/dist/usr/lib/
cp -r /usr/lib/x86_64-linux-gnu/gstreamer-1.0 tmp/linux/dist/usr/lib/ cp -r /usr/lib/x86_64-linux-gnu/gstreamer-1.0 tmp/linux/dist/usr/lib/
cp -r /usr/lib/x86_64-linux-gnu/gstreamer1.0 tmp/linux/dist/usr/lib/ cp -r /usr/lib/x86_64-linux-gnu/gstreamer1.0 tmp/linux/dist/usr/lib/
cp vendor/status-go/build/bin/libstatus.so tmp/linux/dist/usr/lib/ cp vendor/status-lib/vendor/status-go/build/bin/libstatus.so tmp/linux/dist/usr/lib/
echo -e $(BUILD_MSG) "AppImage" echo -e $(BUILD_MSG) "AppImage"
linuxdeployqt tmp/linux/dist/nim-status.desktop -no-copy-copyright-files -qmldir=ui -qmlimport=$(QTDIR)/qml -bundle-non-qt-libs linuxdeployqt tmp/linux/dist/nim-status.desktop -no-copy-copyright-files -qmldir=ui -qmlimport=$(QTDIR)/qml -bundle-non-qt-libs

1
vendor/status-go vendored

@ -1 +0,0 @@
Subproject commit 33e0611d6431536122c315161e6896baae55ea67

2
vendor/status-lib vendored

@ -1 +1 @@
Subproject commit 62a7c021535d6466702139192f212136d40c658f Subproject commit cf2a43f9b31da1862699bb5538d54a0e91a25ec5