From ee7f98adb1652c840e2140135f68af06586999cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 28 Nov 2018 15:38:23 +0100 Subject: [PATCH] use GIT_REPOSITORY and add DigitalOcean and GitHub zips as fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- modules/react-native-status/desktop/CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/react-native-status/desktop/CMakeLists.txt b/modules/react-native-status/desktop/CMakeLists.txt index 85ba843869..b2e9655168 100755 --- a/modules/react-native-status/desktop/CMakeLists.txt +++ b/modules/react-native-status/desktop/CMakeLists.txt @@ -26,12 +26,22 @@ include_directories(${StatusGo_INCLUDE_DIR}) set(CONFIGURE_SCRIPT build-status-go.sh) -file (STRINGS "../../../STATUS_GO_VERSION" STATUS_GO_VERSION) +file(STRINGS "../../../STATUS_GO_VERSION" STATUS_GO_VERSION) + +# custom status-go builds are identified by '{date}-{time}-{commit}' +if ("${STATUS_GO_VERSION}" MATCHES "[0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]-([0-9a-zA-Z]+)") + set(STATUS_GO_TAG ${CMAKE_MATCH_1}) +else() + set(STATUS_GO_TAG ${STATUS_GO_VERSION}) +endif() ExternalProject_Add(StatusGo_ep PREFIX ${StatusGo_PREFIX} SOURCE_DIR ${StatusGo_SOURCE_DIR} - URL https://github.com/status-im/status-go/releases/download/${STATUS_GO_VERSION}/status-go-desktop.zip + GIT_REPOSITORY https://github.com/status-im/status-go.git + GIT_TAG ${STATUS_GO_TAG} + URL https://status-go.ams3.digitaloceanspaces.com/status-go-desktop-${STATUS_GO_VERSION}.zip + https://github.com/status-im/status-go/archive/${STATUS_GO_VERSION}.zip BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB} CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIGURE_SCRIPT} ${CMAKE_SYSTEM_NAME} ${GO_ROOT_PATH} ${StatusGo_ROOT} ${StatusGo_SOURCE_DIR} ${CMAKE_C_COMPILER} ${CMAKE_CXX_COMPILER} BUILD_COMMAND ""