Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-22 21:31:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup qmake files, Appveyor list produced files

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2019-11-28 19:03:55 +01:00
parent ba4af74a06
commit 6464870cf9
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RetroShare.pro
View File

@ -31,12 +31,6 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
libretroshare.depends += jsonapi-generator libretroshare.depends += jsonapi-generator
} }
rs_webui {
!rs_jsonapi {
error("rs_webui requires rs_jsonapi")
}
}
SUBDIRS += libbitdht SUBDIRS += libbitdht
libbitdht.file = libbitdht/src/libbitdht.pro libbitdht.file = libbitdht/src/libbitdht.pro
libretroshare.depends += openpgpsdk libbitdht libretroshare.depends += openpgpsdk libbitdht

7
appveyor.yml
View File

@ -149,11 +149,14 @@ before_package:
build_script: build_script:
- env - env
- git submodule update --init - git submodule update --init
- qmake -Wall -spec win32-g++ "CONFIG+=debug" "CONFIG+=c++11" - qmake -spec win32-g++ "CONFIG+=debug"
- mingw32-make -j3 - mingw32-make -j3
# scripts to run after build # scripts to run after build
after_build: after_build:
- find C:\projects\RetroShare >> filelist.txt
- cat filelist.txt
- mkdir %RS_DEPLOY% - mkdir %RS_DEPLOY%
- copy retroshare-service\src\retroshare-service.exe %RS_DEPLOY%\ - copy retroshare-service\src\retroshare-service.exe %RS_DEPLOY%\
- copy retroshare-gui\src\retroshare.exe %RS_DEPLOY%\ - copy retroshare-gui\src\retroshare.exe %RS_DEPLOY%\
@ -252,8 +255,6 @@ after_build:
- copy C:\msys64\mingw32\bin\libcmark*.dll %RS_DEPLOY%\ - copy C:\msys64\mingw32\bin\libcmark*.dll %RS_DEPLOY%\
- copy C:\msys64\mingw32\bin\libdouble-conversion*.dll %RS_DEPLOY%\ - copy C:\msys64\mingw32\bin\libdouble-conversion*.dll %RS_DEPLOY%\
- find C:\projects\RetroShare >> filelist.txt
# to disable automatic builds # to disable automatic builds
#build: off #build: off

9
retroshare.pri
View File

@ -164,13 +164,14 @@ no_rs_broadcast_discovery:CONFIG -= rs_broadcast_discovery
CONFIG *= rs_no_webui CONFIG *= rs_no_webui
rs_webui:CONFIG -= rs_no_webui rs_webui:CONFIG -= rs_no_webui
# To enable webui append the following assignation to qmake # To disable retroshare-service option to set webui password from the terminal
# command line "CONFIG+=rs_service_webui_terminal_password" # append the following assignation to qmake command line
# "CONFIG+=no_rs_service_webui_terminal_password"
CONFIG *= rs_service_webui_terminal_password CONFIG *= rs_service_webui_terminal_password
no_rs_service_webui_terminal_password:CONFIG -= rs_service_webui_terminal_password no_rs_service_webui_terminal_password:CONFIG -= rs_service_webui_terminal_password
# To enable retroshare-service terminal login append the following assignation # To disable retroshare-service terminal login append the following assignation
# to qmake command line "CONFIG+=rs_service_terminal_login" # to qmake command line "CONFIG+=no_rs_service_terminal_login"
CONFIG *= rs_service_terminal_login CONFIG *= rs_service_terminal_login
no_rs_service_terminal_login:CONFIG -= rs_service_terminal_login no_rs_service_terminal_login:CONFIG -= rs_service_terminal_login