merged upstream/master

csoler · Oct 5, 2019 · b3ec8e6 · b3ec8e6
2 parents 8269767 + 529dc2a
commit b3ec8e6
Show file tree

Hide file tree

Showing 488 changed files with 25,606 additions and 14,704 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,10 @@
 [submodule "cmark"]
 	path = supportlibs/cmark
 	url = https://github.com/commonmark/cmark.git
+[submodule "build_scripts/OBS"]
+	path = build_scripts/OBS
+	url = https://github.com/RetroShare/OBS.git
+[submodule "supportlibs/udp-discovery-cpp"]
+	path = supportlibs/udp-discovery-cpp
+	url = https://github.com/truvorskameikin/udp-discovery-cpp.git
+	branch = develop
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
       sudo: required
       compiler: gcc
     - os: osx
-      osx_image: xcode9.3
+      osx_image: xcode10.1
       compiler: clang
       sudo: false
 
@@ -22,7 +22,7 @@ before_install:
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install ccach; export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt5; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt5 ; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl miniupnpc libmicrohttpd sqlcipher xapian; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl miniupnpc libmicrohttpd sqlcipher xapian cmark; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install p7zip; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi
 
@@ -47,8 +47,9 @@ addons:
     branch_pattern: coverity_scan
 
 before_script:
-  - if [ $TRAVIS_OS_NAME == linux ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=rs_macos10.13 CONFIG+=no_retroshare_plugins INCLUDEPATH+=/usr/local/opt/openssl/include/ INCLUDEPATH+=/usr/local/Cellar/sqlcipher/4.0.1/include INCLUDEPATH+=/usr/local/Cellar/libmicrohttpd/0.9.62_1/include QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=/usr/local/Cellar/libmicrohttpd/0.9.62_1/lib QMAKE_LIBDIR+=/usr/local/Cellar/sqlcipher/4.0.1/lib; fi
+  - env
+  - if [ $TRAVIS_OS_NAME == linux ]; then qmake; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then qmake CONFIG+=rs_macos10.14 INCLUDEPATH+=/usr/local/opt/openssl/include/ INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | headn -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/libmicrohttpd/*/include | head -n 1) QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=$(find /usr/local/Cellar/libmicrohttpd/*/lib | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib | head -n 1); fi
 
 script:
   - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi

diff --git a/LICENSE.AGPL.txt b/LICENSE.AGPL.txt
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Build Status
 | Platform  | Build Status |
 | :------------- | :------------- |
 | GNU/Linux, MacOS, (via travis-ci)  | [![Build Status](https://travis-ci.org/RetroShare/RetroShare.svg?branch=master)](https://travis-ci.org/RetroShare/RetroShare)  |
-| Windows, `MSys2` (via appveyor)  | [![Build status](https://ci.appveyor.com/api/projects/status/github/RetroShare/RetroShare?svg=true)](https://ci.appveyor.com/project/G10h4ck/retroshare-u4lmn)  |
+| Windows, `MSys2` (via appveyor)  | [![Build status](https://ci.appveyor.com/api/projects/status/github/RetroShare/RetroShare?svg=true)](https://ci.appveyor.com/project/RetroShare58622/retroshare)  |
 
 Compilation on Windows
 ----------------------------

diff --git a/RetroShare.pro b/RetroShare.pro
@@ -31,15 +31,15 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
 
 SUBDIRS += libbitdht
 libbitdht.file = libbitdht/src/libbitdht.pro
-libretroshare.depends = openpgpsdk libbitdht
+libretroshare.depends += openpgpsdk libbitdht
 
 SUBDIRS += libretroshare
 libretroshare.file = libretroshare/src/libretroshare.pro
 
 libresapi {
     SUBDIRS += libresapi
     libresapi.file = libresapi/src/libresapi.pro
-    libresapi.depends = libretroshare
+    libresapi.depends += libretroshare
 }
 
 retroshare_gui {

diff --git a/WindowsMSys2_InstallGuide.md b/WindowsMSys2_InstallGuide.md
@@ -46,6 +46,7 @@ Install all needed dependencies:
 	pacman -S mingw-w64-i686-xapian-core
 	pacman -S mingw-w64-i686-sqlcipher
 	pacman -S mingw-w64-i686-qt5
+	pacman -S mingw32/mingw-w64-i686-cmake
 
 We're done installing MSYS2, close the shell terminal.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -85,11 +85,12 @@ environment:
 #  - cmd: echo This is batch again
 #  - cmd: set MY_VAR=12345
 install:
-  - git submodule update --init
+  # We cannot get OBS submodule as it use illegal folder name for windows.
+  #- git submodule update --init
   # Configuring MSys2
   - set PATH=C:\msys64\usr\bin;%PATH%
   - set PATH=C:\msys64\mingw32\bin;%PATH%
-  - pacman --noconfirm -S mingw-w64-i686-qt5 mingw-w64-i686-miniupnpc mingw-w64-i686-sqlcipher mingw-w64-i686-libmicrohttpd mingw-w64-i686-xapian-core
+  - pacman --noconfirm -S mingw-w64-i686-qt5 mingw-w64-i686-miniupnpc mingw-w64-i686-sqlcipher mingw-w64-i686-libmicrohttpd mingw-w64-i686-xapian-core mingw-w64-i686-cmark
   #- pacman --noconfirm -S mingw-w64-i686-qt5-static mingw-w64-i686-miniupnpc mingw-w64-i686-sqlcipher mingw-w64-i686-libmicrohttpd
   #- set PATH=C:\msys64\mingw32\qt5-static\bin\;%PATH%
 
@@ -104,6 +105,15 @@ install:
   - copy C:\msys64\mingw64\x86_64-w64-mingw32\bin\ranlib.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-ranlib.exe
   - copy C:\msys64\mingw64\bin\windres.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-windres.exe
 
+  # Work-around linker looking for Qt dll in wrong place
+  - copy C:\msys64\mingw32\bin\Qt5PrintSupport.dll C:\msys64\mingw32\lib\Qt5PrintSupport.dll
+  - copy C:\msys64\mingw32\bin\Qt5Widgets.dll C:\msys64\mingw32\lib\Qt5Widgets.dll
+  - copy C:\msys64\mingw32\bin\Qt5Multimedia.dll C:\msys64\mingw32\lib\Qt5Multimedia.dll
+  - copy C:\msys64\mingw32\bin\Qt5Gui.dll C:\msys64\mingw32\lib\Qt5Gui.dll
+  - copy C:\msys64\mingw32\bin\Qt5Network.dll C:\msys64\mingw32\lib\Qt5Network.dll
+  - copy C:\msys64\mingw32\bin\Qt5Xml.dll C:\msys64\mingw32\lib\Qt5Xml.dll
+  - copy C:\msys64\mingw32\bin\Qt5Core.dll C:\msys64\mingw32\lib\Qt5Core.dll
+
 
 #---------------------------------#
 #       build configuration       #
@@ -135,13 +145,15 @@ before_package:
 
 # to run your custom scripts instead of automatic MSBuild
 build_script:
+  - env
+  - git submodule update --init
   - qmake -Wall -spec win32-g++ "CONFIG=debug"
   - mingw32-make -j3
 
 # scripts to run after build
 after_build:
   - mkdir %RS_DEPLOY%
-  - copy retroshare-nogui\src\retroshare-nogui.exe %RS_DEPLOY%\
+  - copy retroshare-service\src\retroshare-service.exe %RS_DEPLOY%\
   - copy retroshare-gui\src\retroshare.exe %RS_DEPLOY%\
 
 ## In Debug build winedeplyqt forget the non debug Qt libs
@@ -195,11 +207,13 @@ after_build:
   - windeployqt %RS_DEPLOY%\retroshare.exe
 
   - copy C:\msys64\mingw32\bin\libbz2*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libeay32.dll %RS_DEPLOY%\
+  #- copy C:\msys64\mingw32\bin\libeay32.dll %RS_DEPLOY%\
+  - copy C:\OpenSSL-Win32\libeay32.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\libminiupnpc.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\libsqlcipher*.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\libsqlite3*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\ssleay32.dll %RS_DEPLOY%\
+  #- copy C:\msys64\mingw32\bin\ssleay32.dll %RS_DEPLOY%\
+  - copy C:\OpenSSL-Win32\ssleay32.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\zlib*.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\libgcc_s_dw2*.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\libstdc*.dll %RS_DEPLOY%\
@@ -232,6 +246,10 @@ after_build:
   - copy C:\msys64\mingw32\bin\libunistring*.dll %RS_DEPLOY%\
   - copy C:\msys64\mingw32\bin\libffi*.dll %RS_DEPLOY%\
 
+## Needed for cmark
+  - 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
@@ -241,10 +259,11 @@ after_build:
 #      artifacts configuration    #
 #---------------------------------#
 
-artifacts:
-  - path: $(RS_DEPLOY)
-  - path: '**\*.exe'
-  - path: filelist.txt
+#artifacts:
+#  - path: '**\*.exe'
+#  - path: filelist.txt
+# - path: $(RS_DEPLOY)
+
 #
 #  # pushing a single file
 #  - path: test.zip