Use STATUS_GO_VERSION for desktop

Fix path

extractGroupMembershipSignatures -> verifyGroupMembershipSignatures

Minor

Use release link instead of git url

Fix

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
Vitaliy Vlasov 2018-10-16 16:06:52 +03:00 committed by yenda
parent 24068fe0e9
commit 299c44afef
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
2 changed files with 5 additions and 5 deletions

View File

@ -11557,7 +11557,7 @@
} }
}, },
"react-native": { "react-native": {
"version": "git+https://github.com/status-im/react-native-desktop.git#67a4c72a9353ebd589492f08218b218bc020997a", "version": "git+https://github.com/status-im/react-native-desktop.git#master",
"requires": { "requires": {
"absolute-path": "0.0.0", "absolute-path": "0.0.0",
"art": "0.10.3", "art": "0.10.3",
@ -12087,7 +12087,7 @@
"dependencies": { "dependencies": {
"file-type": { "file-type": {
"version": "3.9.0", "version": "3.9.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
"integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
} }
} }

View File

@ -33,12 +33,12 @@ else()
set(CONFIGURE_SCRIPT build-status-go.sh) set(CONFIGURE_SCRIPT build-status-go.sh)
endif() endif()
file (STRINGS "../../../STATUS_GO_VERSION" STATUS_GO_VERSION)
ExternalProject_Add(StatusGo_ep ExternalProject_Add(StatusGo_ep
PREFIX ${StatusGo_PREFIX} PREFIX ${StatusGo_PREFIX}
SOURCE_DIR ${StatusGo_SOURCE_DIR} SOURCE_DIR ${StatusGo_SOURCE_DIR}
GIT_REPOSITORY https://github.com/status-im/status-go.git URL https://github.com/status-im/status-go/archive/v${STATUS_GO_VERSION}.zip
GIT_TAG c86f8bf6ca35280e7041674f76a2ef1fe333e482
BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB} BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB}
CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIGURE_SCRIPT} ${GO_ROOT_PATH} ${StatusGo_ROOT} ${StatusGo_SOURCE_DIR} CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIGURE_SCRIPT} ${GO_ROOT_PATH} ${StatusGo_ROOT} ${StatusGo_SOURCE_DIR}
BUILD_COMMAND "" BUILD_COMMAND ""