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

Merge pull request #5752 from status-im/bug/config-relative-path 

Set .envfile path based on build type
This commit is contained in:
Vitaliy Vlasov 2018-09-05 12:24:33 +03:00 committed by GitHub
parent 6e306fba88 ab5d69968c
commit c176d9a160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/desktop.groovy
View File

@ -114,7 +114,7 @@ def bundleLinux(type = 'nightly') {
sh 'mkdir AppDir'
}
sh "cp -r ./deployment/linux/usr ${packageFolder}/AppDir"
sh "cp ./deployment/linux/.env ${packageFolder}/AppDir"
sh "cp ./deployment/env ${packageFolder}/AppDir/usr/bin"
sh "cp ./desktop/bin/StatusIm ${packageFolder}/AppDir/usr/bin"
sh "cp ./desktop/reportApp/reportApp ${packageFolder}/AppDir/usr/bin"
sh 'wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage'
@ -187,6 +187,8 @@ def bundleMacOS(type = 'nightly') {
sh 'chmod +x Status.app/Contents/Resources/ubuntu-server'
sh 'cp ../desktop/bin/StatusIm Status.app/Contents/MacOS/Status'
sh 'cp ../desktop/reportApp/reportApp Status.app/Contents/MacOS'
sh "cp ../deployment/env Status.app/Contents/Resources"
sh 'ln -sf ../Resources/env Status.app/Contents/MacOS/env'
sh 'cp -f ../deployment/macos/qt-reportApp.conf Status.app/Contents/Resources'
sh 'ln -sf ../Resources/qt-reportApp.conf Status.app/Contents/MacOS/qt.conf'
sh 'install_name_tool -add_rpath "@executable_path/../Frameworks" ' +

1
deployment/linux/.env → deployment/env
View File

@ -6,6 +6,7 @@ OFFLINE_INBOX_ENABLED=1
OFFLINE_INBOX_MANY_ENABLED=1
LOG_LEVEL=debug
LOG_LEVEL_STATUS_GO=info
FLEET=eth.beta
JSC_ENABLED=1
QUEUE_MESSAGE_ENABLED=1
MANY_WHISPER_TOPICS_ENABLED=0

7
desktop/CMakeLists.txt
View File

@ -15,6 +15,13 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
message(STATUS "EXTERNAL_MODULES_DIR: ${EXTERNAL_MODULES_DIR}")
string(REGEX MATCH "BUILD_FOR_BUNDLE" BUILD_FOR_BUNDLE "${CMAKE_CXX_FLAGS}")
if(${BUILD_FOR_BUNDLE} MATCHES "BUILD_FOR_BUNDLE")
set(ENVFILE "/env")
else()
set(ENVFILE "/../../.env")
endif()
foreach(external_module ${EXTERNAL_MODULES_DIR})
message(STATUS "external_module: ${external_module}")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../${external_module} ${CMAKE_CURRENT_BINARY_DIR}/${external_module})