diff --git a/RetroShare.pro b/RetroShare.pro index 760da5cb2..2e9b0a17f 100644 --- a/RetroShare.pro +++ b/RetroShare.pro @@ -31,12 +31,6 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) { libretroshare.depends += jsonapi-generator } -rs_webui { - !rs_jsonapi { - error("rs_webui requires rs_jsonapi") - } -} - SUBDIRS += libbitdht libbitdht.file = libbitdht/src/libbitdht.pro libretroshare.depends += openpgpsdk libbitdht diff --git a/appveyor.yml b/appveyor.yml index db33f5d04..386370a44 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -149,11 +149,14 @@ before_package: build_script: - env - git submodule update --init - - qmake -Wall -spec win32-g++ "CONFIG+=debug" "CONFIG+=c++11" + - qmake -spec win32-g++ "CONFIG+=debug" - mingw32-make -j3 # scripts to run after build after_build: + - find C:\projects\RetroShare >> filelist.txt + - cat filelist.txt + - mkdir %RS_DEPLOY% - copy retroshare-service\src\retroshare-service.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\libdouble-conversion*.dll %RS_DEPLOY%\ - - find C:\projects\RetroShare >> filelist.txt - # to disable automatic builds #build: off diff --git a/retroshare.pri b/retroshare.pri index fb13a1f95..f74fc7aa4 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -164,13 +164,14 @@ no_rs_broadcast_discovery:CONFIG -= rs_broadcast_discovery CONFIG *= rs_no_webui rs_webui:CONFIG -= rs_no_webui -# To enable webui append the following assignation to qmake -# command line "CONFIG+=rs_service_webui_terminal_password" +# To disable retroshare-service option to set webui password from the terminal +# append the following assignation to qmake command line +# "CONFIG+=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 qmake command line "CONFIG+=rs_service_terminal_login" +# To disable retroshare-service terminal login append the following assignation +# to qmake command line "CONFIG+=no_rs_service_terminal_login" CONFIG *= rs_service_terminal_login no_rs_service_terminal_login:CONFIG -= rs_service_terminal_login