From 180ea6c99fcf7a4717c34c0ae06a71a8eee062b7 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 22 Jan 2019 21:55:53 +0100 Subject: [PATCH 01/17] new branch for MacOS release --- .travis.yml | 60 ++++++++++++++-------------------------- travis_makeOSXPackage.sh | 37 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 39 deletions(-) create mode 100644 travis_makeOSXPackage.sh diff --git a/.travis.yml b/.travis.yml index b02445b39..9528dd8ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,19 +5,12 @@ language: cpp matrix: include: - - os: linux - dist: trusty - sudo: required - compiler: gcc - os: osx osx_image: xcode6.2 compiler: clang - sudo: false + sudo: required before_install: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev libbz2-dev libmicrohttpd-dev libsqlite3-dev libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt openssl miniupnpc libmicrohttpd sqlcipher xapian; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt ; fi @@ -25,13 +18,15 @@ before_install: - wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz - tar -xf v1.1.0.tar.gz - if [ $TRAVIS_OS_NAME == osx ]; then cp -r rapidjson-1.1.0/include/rapidjson/ /usr/local/include/rapidjson ; fi - - if [ $TRAVIS_OS_NAME == linux ]; then sudo cp -r rapidjson-1.1.0/include/rapidjson/ /usr/include/rapidjson ; fi + - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/include/* /usr/local/include/; fi + - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/lib/*.a /usr/local/lib/; fi + - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/lib/*.dylib /usr/local/lib/; fi env: global: # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's public key - - secure: "auwuhxelaMriNaXzT8I03xrh1s+STicNyNToOWFCAYKxkWWQ4WeaCO6kRDmQrejhizMUILGU+s4FrWTEhDsviftGAF86EgzxxbSBfsHHAP4t2C0pcXX8/WxEoh1IrUs7iGCIpl7O2cvWqGidc20ROeptSEd1uQgkHnn14D9A2YmXf8g52PzqivKkb6HKfkVTPdmNJkMBT5eDtEw6DIk+DvnvRo6b6uanvVAKS9CBwXOdA3rLzaD9bz0LrdL9X1CNoTkGROyez0Lsc4zTr70id2Xfp1MMmJAV6hgQy+iwE37wRyrxJf3dkh5SUAAMUC9Xnvh/iBKNQKdQGhj2WGcV7GZV9k6u9DA1w2H0kcrwt9KHUXdhEQ67yr6Boa9ZFwdDb5VIOtC6iHAoDZXharHhiuxi0K/bCtwNAajrMjBCm9mWhEKvtoxUUYxAJajhJkkO3ERaOU3zHE+06esDzGozd2YOEH8a74HhYy4xvhR05Yj00hAWLS2kIaUITiqmBf6Yuh5XwH7KCDcapxF59ROWqyicdwtbfWpvN8IvFuGKyxYuEfoT8WxZ4lZpo4Q9CrTB7gedJYJxYNfZE/okWoFBb4cpPI94PHo3DZPR7lVyQ60RNyeR0nOeqf8NW8cBT1G4jw3u1LEyAdyvup+54aALw0DCVyoDojSXB8s+AlQG2JE=" + - secure: "GvA+CSM1ksvsmnkFkyWmQYcvFIJqd/fJVFGUcv/wBlrAqAWka1YRph8ox7L3+tJyISrf0MW7v+W7Rm7FOOMleeP+n4aWtFBr41R22RzlgMt6coRqho7qrNud6JkPk/Iuw2dtyMyfrTb+H+alPHs+SUnQxQ/i9Px8W7V94LTG6cim5zksNFkD7RPI94dFT/84teOEet+2NqHHuAZsf7Xfs7rk3triWPkcr7x9fzgGw/QvvKOmJwrprjmi1iKX/+cnu8adGwrmR7Q5bEvFkyChOVfiXymQQVOL4nD17PfT3fOA6u/w1pWD9jw0EsDpXP5dL8HZ6EDUoMKsUtTe2vlH40Ls+E8CA011y1VuXgRVzOzYk/TPecrW4aAmPPJJKiWnvg+URTf+A9YyphUVxwaaYXWcHWYO+zFF9N4YrOsgQAdQ+M6dg19nSPn/53VhoD4PFxS65ajBEgZi6WTwyk/AChmRXklqNHD0GOSKYW3M15BoAGh7tCrUkIhhEGmaoUsmJzA5od9H5+QxkSSS4suZFu9j8KJIthfukyF+Y1n3zDsqBS4XVYMIMno4+Jd65Qy4MQC7yPanHcpV6FOyfs7s3aXE4yUa+66iIRAr9LJDu41iLpMKUxADrAbhZwxm9vzBbQxqpJHwH6Rv9C+T5zqNuldmaRBtei05sOtD3AlJWaE=" addons: coverity_scan: @@ -43,37 +38,24 @@ 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 echo TEMPORARILY DISABLED qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=rs_macos10.12 INCLUDEPATH+=/usr/local/opt/openssl/include/ QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/; fi + - if [ $TRAVIS_OS_NAME == osx ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=rs_macos10.12 CONFIG+=no_retroshare_plugins INCLUDEPATH+=/usr/local/opt/openssl/include/ QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/; fi script: - - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j2; fi - - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then echo TEMPORARILY DISABLED make -j2; fi + - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi +after_success: + - if [ $TRAVIS_OS_NAME == osx ]; then chmod +x ./travis_makeOSXPackage.sh && ./travis_makeOSXPackage.sh ; fi +branches: + only: + - v0.6-MacOS-Travis-Deploy -#after_success: -# - if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then rake deploy; fi +deploy: + provider: releases + api_key: + secure: GvA+CSM1ksvsmnkFkyWmQYcvFIJqd/fJVFGUcv/wBlrAqAWka1YRph8ox7L3+tJyISrf0MW7v+W7Rm7FOOMleeP+n4aWtFBr41R22RzlgMt6coRqho7qrNud6JkPk/Iuw2dtyMyfrTb+H+alPHs+SUnQxQ/i9Px8W7V94LTG6cim5zksNFkD7RPI94dFT/84teOEet+2NqHHuAZsf7Xfs7rk3triWPkcr7x9fzgGw/QvvKOmJwrprjmi1iKX/+cnu8adGwrmR7Q5bEvFkyChOVfiXymQQVOL4nD17PfT3fOA6u/w1pWD9jw0EsDpXP5dL8HZ6EDUoMKsUtTe2vlH40Ls+E8CA011y1VuXgRVzOzYk/TPecrW4aAmPPJJKiWnvg+URTf+A9YyphUVxwaaYXWcHWYO+zFF9N4YrOsgQAdQ+M6dg19nSPn/53VhoD4PFxS65ajBEgZi6WTwyk/AChmRXklqNHD0GOSKYW3M15BoAGh7tCrUkIhhEGmaoUsmJzA5od9H5+QxkSSS4suZFu9j8KJIthfukyF+Y1n3zDsqBS4XVYMIMno4+Jd65Qy4MQC7yPanHcpV6FOyfs7s3aXE4yUa+66iIRAr9LJDu41iLpMKUxADrAbhZwxm9vzBbQxqpJHwH6Rv9C+T5zqNuldmaRBtei05sOtD3AlJWaE= + file: retroshare-gui/src/retroshare.dmg + skip_cleanup: true + on: + repo: csoler/RetroShare + branch: v0.6-MacOS-Travis-Deploy -#branches: -# only: -# - master -# - travis - -notifications: - email: false - irc: - channels: - - "chat.freenode.net#retroshare" - template: - - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" - - "Message: %{commit_message}" - - "Commit details: %{compare_url}" -# webhooks: -# urls: -# - https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3 -# on_success: change -# on_failure: always -# on_start: always - -#env: -# - RVM=2.0.0 LANG="en_US.UTF-8" diff --git a/travis_makeOSXPackage.sh b/travis_makeOSXPackage.sh new file mode 100644 index 000000000..eb66c7ef3 --- /dev/null +++ b/travis_makeOSXPackage.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# Install the 7z to create dmg archives. +brew install p7zip + +# Package your app +echo "Packaging retroshare..." +#cd ${project_dir}/build/macOS/clang/x86_64/release/ +cd retroshare-gui/src/ + +# Remove build directories that you don't want to deploy +rm -rf moc +rm -rf obj +rm -rf qrc + +# if test "${TAG_NAME}" = "" ; then +# TAG_NAME = "no_tag" ; +# echo No specific tag used. +# fi + +# This automatically creates retroshare.dmg + +echo "Creating dmg archive..." +macdeployqt retroshare.app -dmg + +#mv retroshare.dmg "retroshare_${TAG_NAME}.dmg" + +# You can use the appdmg command line app to create your dmg file if +# you want to use a custom background and icon arrangement. I'm still +# working on this for my apps, myself. If you want to do this, you'll +# remove the -dmg option above. +# appdmg json-path YourApp_${TRAVIS_TAG}.dmg + +# Copy other project files +# cp "${project_dir}/README.md" "README.md" +# cp "${project_dir}/LICENSE" "LICENSE" +# cp "${project_dir}/Qt License" "Qt License" From 11abdb7bae8ba00e3013c65dff74300ef42c9edc Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 22 Jan 2019 22:20:16 +0100 Subject: [PATCH 02/17] attempt to fix compilation of MacOS --- libbitdht/src/util/bdthreads.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbitdht/src/util/bdthreads.cc b/libbitdht/src/util/bdthreads.cc index 942df305f..3fce7ff43 100644 --- a/libbitdht/src/util/bdthreads.cc +++ b/libbitdht/src/util/bdthreads.cc @@ -121,7 +121,7 @@ void bdThread::join() /* waits for the the mTid thread to stop */ mMutex.lock(); { -#if defined(_WIN32) || defined(__MINGW32__) +#if defined(_WIN32) || defined(__MINGW32__) || defined(__APPLE__) /* Its a struct in Windows compile and the member .p ist checked in the pthreads library */ #else if(mTid > 0) From 1f81a4cb6fb25113653c6fa4ff94ab373c4abdcb Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 23 Jan 2019 13:20:05 +0100 Subject: [PATCH 03/17] added 10.13 as compilation target on MacOS --- retroshare.pri | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/retroshare.pri b/retroshare.pri index d6b66d44c..d895c1954 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -154,6 +154,7 @@ rs_macos10.8:CONFIG -= rs_macos10.11 rs_macos10.9:CONFIG -= rs_macos10.11 rs_macos10.10:CONFIG -= rs_macos10.11 rs_macos10.12:CONFIG -= rs_macos10.11 +rs_macos10.13:CONFIG -= rs_macos10.11 # To enable JSON API append the following assignation to qmake command line # "CONFIG+=rs_jsonapi" @@ -627,6 +628,14 @@ macx-* { QMAKE_CXXFLAGS += -Wno-nullability-completeness QMAKE_CFLAGS += -Wno-nullability-completeness } + rs_macos10.13 { + message(***retroshare.pri: Set Target and SDK to MacOS 10.13 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13 + QMAKE_MAC_SDK = macosx10.13 + QMAKE_CXXFLAGS += -Wno-nullability-completeness + QMAKE_CFLAGS += -Wno-nullability-completeness + } + message(***retroshare.pri:MacOSX) BIN_DIR += "/usr/bin" From 4938200bace76eb95c1264f7e1774f544dafade8 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 23 Jan 2019 17:39:29 +0100 Subject: [PATCH 04/17] fixed merge --- .travis.yml | 17 +++++++++-------- retroshare.pri | 24 +++++++++++++++++------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9528dd8ce..9c6d9b10f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,21 +6,22 @@ language: cpp matrix: include: - os: osx - osx_image: xcode6.2 + osx_image: xcode9.3 compiler: clang - sudo: required + sudo: false before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt openssl miniupnpc libmicrohttpd sqlcipher xapian; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt ; fi + - 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 p7zip; fi + - if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi - wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz - tar -xf v1.1.0.tar.gz - if [ $TRAVIS_OS_NAME == osx ]; then cp -r rapidjson-1.1.0/include/rapidjson/ /usr/local/include/rapidjson ; fi - - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/include/* /usr/local/include/; fi - - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/lib/*.a /usr/local/lib/; fi - - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/lib/*.dylib /usr/local/lib/; fi env: global: @@ -38,7 +39,7 @@ addons: branch_pattern: coverity_scan before_script: - - if [ $TRAVIS_OS_NAME == osx ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=rs_macos10.12 CONFIG+=no_retroshare_plugins INCLUDEPATH+=/usr/local/opt/openssl/include/ QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/; 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/include QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=/usr/local/Cellar/libmicrohttpd/0.9.62/lib QMAKE_LIBDIR+=/usr/local/Cellar/sqlcipher/4.0.1/lib; fi script: - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi diff --git a/retroshare.pri b/retroshare.pri index d895c1954..d6ff44282 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -638,14 +638,24 @@ macx-* { message(***retroshare.pri:MacOSX) - BIN_DIR += "/usr/bin" - INC_DIR += "/usr/include" - INC_DIR += "/usr/local/include" - INC_DIR += "/opt/local/include" - LIB_DIR += "/usr/local/lib" - LIB_DIR += "/opt/local/lib" + # BIN_DIR += "/usr/bin" + # INC_DIR += "/usr/include" + # INC_DIR += "/usr/local/include" + # INC_DIR += "/opt/local/include" + # LIB_DIR += "/usr/local/lib" + # LIB_DIR += "/opt/local/lib" + BIN_DIR += "/Applications/Xcode.app/Contents/Developer/usr/bin" + INC_DIR += "/usr/local/Cellar/miniupnpc/2.1/include" + INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.59/include" + INC_DIR += "/usr/local/Cellar/sqlcipher/4.0.0/include" + LIB_DIR += "/usr/local/opt/openssl/lib/" + LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.59/lib" + LIB_DIR += "/usr/local/Cellar/sqlcipher/4.0.0/lib" + LIB_DIR += "/usr/local/Cellar/miniupnpc/2.1/lib" CONFIG += c++11 - RS_UPNP_LIB = miniupnpc + INCLUDEPATH += "/usr/local/include" + RS_UPNP_LIB = miniupnpc + QT += macextras } From bfdca129c5f555d4b35e7e0ca26ede85920f1a1d Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 23 Jan 2019 20:27:00 +0100 Subject: [PATCH 05/17] fixed travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c6d9b10f..0ff4dd14c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ after_success: branches: only: - - v0.6-MacOS-Travis-Deploy + - v0.6-MacOS-Travis-Deploy2 deploy: provider: releases @@ -58,5 +58,5 @@ deploy: skip_cleanup: true on: repo: csoler/RetroShare - branch: v0.6-MacOS-Travis-Deploy + branch: v0.6-MacOS-Travis-Deploy2 From d0bacbd6c25fb5812798bb00909831a2626ce28f Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 23 Jan 2019 21:05:29 +0100 Subject: [PATCH 06/17] experimental fix --- libresapi/src/api/json.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libresapi/src/api/json.cpp b/libresapi/src/api/json.cpp index 16f238f39..82c598341 100644 --- a/libresapi/src/api/json.cpp +++ b/libresapi/src/api/json.cpp @@ -19,7 +19,6 @@ * along with this program. If not, see . * * * *******************************************************************************/ -#define nullptr 0 #include "json.h" #include @@ -33,6 +32,7 @@ #include #include #include +#include "util/cxx11retrocompat.h" #ifndef WIN32 #define _stricmp strcasecmp From f013a43e482f8fb88a1e67d9f3885cec2b649905 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 24 Jan 2019 10:16:13 +0100 Subject: [PATCH 07/17] fixed versions for libs in MacOS --- retroshare.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index d6ff44282..bf32c8e19 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -646,11 +646,11 @@ macx-* { # LIB_DIR += "/opt/local/lib" BIN_DIR += "/Applications/Xcode.app/Contents/Developer/usr/bin" INC_DIR += "/usr/local/Cellar/miniupnpc/2.1/include" - INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.59/include" - INC_DIR += "/usr/local/Cellar/sqlcipher/4.0.0/include" + INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62/include" + INC_DIR += "/usr/local/Cellar/sqlcipher/4.0.1/include" LIB_DIR += "/usr/local/opt/openssl/lib/" - LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.59/lib" - LIB_DIR += "/usr/local/Cellar/sqlcipher/4.0.0/lib" + LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62/lib" + LIB_DIR += "/usr/local/Cellar/sqlcipher/4.0.1/lib" LIB_DIR += "/usr/local/Cellar/miniupnpc/2.1/lib" CONFIG += c++11 INCLUDEPATH += "/usr/local/include" From a8d3df3b83d25ce3c63bd12245e460fb024b4e2a Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 24 Jan 2019 11:02:17 +0100 Subject: [PATCH 08/17] fixed directory for libmicrohttpd --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ff4dd14c..8d1950e2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ addons: branch_pattern: coverity_scan before_script: - - 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/include QMAKE_LIBDIR+=/usr/local/opt/openssl/lib/ QMAKE_LIBDIR+=/usr/local/Cellar/libmicrohttpd/0.9.62/lib QMAKE_LIBDIR+=/usr/local/Cellar/sqlcipher/4.0.1/lib; 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 script: - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi From 68c0c65e943b9fbe6ca237db944ff55165a62c18 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 24 Jan 2019 11:59:31 +0100 Subject: [PATCH 09/17] fixed .pri for MacOS --- retroshare.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index bf32c8e19..13402cf3e 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -646,10 +646,10 @@ macx-* { # LIB_DIR += "/opt/local/lib" BIN_DIR += "/Applications/Xcode.app/Contents/Developer/usr/bin" INC_DIR += "/usr/local/Cellar/miniupnpc/2.1/include" - INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62/include" + INC_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62_1/include" INC_DIR += "/usr/local/Cellar/sqlcipher/4.0.1/include" LIB_DIR += "/usr/local/opt/openssl/lib/" - LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62/lib" + LIB_DIR += "/usr/local/Cellar/libmicrohttpd/0.9.62_1/lib" LIB_DIR += "/usr/local/Cellar/sqlcipher/4.0.1/lib" LIB_DIR += "/usr/local/Cellar/miniupnpc/2.1/lib" CONFIG += c++11 From 8ecddc3fa50716d4f272e3b3a3964334845812b9 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 09:45:21 +0100 Subject: [PATCH 10/17] compilation experiment --- libretroshare/src/serialiser/rstypeserializer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libretroshare/src/serialiser/rstypeserializer.h b/libretroshare/src/serialiser/rstypeserializer.h index da34e1baf..c4f0439cf 100644 --- a/libretroshare/src/serialiser/rstypeserializer.h +++ b/libretroshare/src/serialiser/rstypeserializer.h @@ -131,7 +131,8 @@ struct RsTypeSerializer /// Generic types template - typename std::enable_if::value || !(std::is_base_of::value || std::is_enum::value || std::is_base_of::value)>::type + typename std::enable_if::value + || !(std::is_base_of::value || std::is_enum::value || std::is_base_of::value || std::is_same::value)>::type static /*void*/ serial_process( RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext& ctx, T& member, const std::string& member_name ) From 64b584cccc40fce266ef44c3014b15bbd5790b84 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 10:11:09 +0100 Subject: [PATCH 11/17] fixed template problem in memory handle serialization --- libretroshare/src/retroshare/rstypes.h | 27 ++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index 1221f806c..a41a459a1 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -322,13 +322,32 @@ struct DirDetails : RsSerializable #if defined(__GNUC__) && !defined(__clang__) # pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif // defined(__GNUC__) && !defined(__clang__) - std::uintptr_t& handle(reinterpret_cast(ref)); - RS_SERIAL_PROCESS(handle); - std::uintptr_t& parentHandle(reinterpret_cast(parent)); - RS_SERIAL_PROCESS(parentHandle); + + // (Cyril) We have to do this because on some systems (MacOS) uintptr_t is unsigned long which is not well defined. It is always + // preferable to force type serialization to the correct size rather than letting the compiler choose for us. + // /!\ This structure cannot be sent over the network. The serialization would be inconsistent. + + if(sizeof(ref) == 4) + { + std::uint32_t& handle(reinterpret_cast(ref)); + RS_SERIAL_PROCESS(handle); + std::uint32_t& parentHandle(reinterpret_cast(parent)); + RS_SERIAL_PROCESS(parentHandle); + } + else if(sizeof(ref) == 8) + { + std::uint64_t& handle(reinterpret_cast(ref)); + RS_SERIAL_PROCESS(handle); + std::uint64_t& parentHandle(reinterpret_cast(parent)); + RS_SERIAL_PROCESS(parentHandle); + } + else + std::cerr << __PRETTY_FUNCTION__ << ": cannot serialize raw pointer of size " << sizeof(ref) << std::endl; + #if defined(__GNUC__) && !defined(__clang__) # pragma GCC diagnostic pop #endif // defined(__GNUC__) && !defined(__clang__) + RS_SERIAL_PROCESS(prow); RS_SERIAL_PROCESS(type); RS_SERIAL_PROCESS(id); From 3836ed836b84180aa6099b12773206fd3351650d Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 10:26:34 +0100 Subject: [PATCH 12/17] fixed template problem in memory handle serialization --- libretroshare/src/retroshare/rstypes.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index a41a459a1..efc467518 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -277,14 +277,24 @@ struct DirStub : RsSerializable { RS_SERIAL_PROCESS(type); RS_SERIAL_PROCESS(name); -#if defined(__GNUC__) && !defined(__clang__) -# pragma GCC diagnostic ignored "-Wstrict-aliasing" -#endif // defined(__GNUC__) && !defined(__clang__) - std::uintptr_t& handle(reinterpret_cast(ref)); - RS_SERIAL_PROCESS(handle); -#if defined(__GNUC__) && !defined(__clang__) -# pragma GCC diagnostic pop -#endif // defined(__GNUC__) && !defined(__clang__) + + // (Cyril) We have to do this because on some systems (MacOS) uintptr_t is unsigned long which is not well defined. It is always + // preferable to force type serialization to the correct size rather than letting the compiler choose for us. + // /!\ This structure cannot be sent over the network. The serialization would be inconsistent. + + if(sizeof(ref) == 4) + { + std::uint32_t& handle(reinterpret_cast(ref)); + RS_SERIAL_PROCESS(handle); + } + else if(sizeof(ref) == 8) + { + std::uint64_t& handle(reinterpret_cast(ref)); + RS_SERIAL_PROCESS(handle); + } + else + std::cerr << __PRETTY_FUNCTION__ << ": cannot serialize raw pointer of size " << sizeof(ref) << std::endl; + } }; From ad45a7781cb3908584a966fdbf1f1ba1a0e5a670 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 14:23:08 +0100 Subject: [PATCH 13/17] removed test for unsigned long in serialization, and added back pragma to avoid strict aliasing error in rstypes.h --- libretroshare/src/retroshare/rstypes.h | 6 ++++++ libretroshare/src/serialiser/rstypeserializer.h | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index efc467518..71a8406a1 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -278,6 +278,9 @@ struct DirStub : RsSerializable RS_SERIAL_PROCESS(type); RS_SERIAL_PROCESS(name); +#if defined(__GNUC__) && !defined(__clang__) +# pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif // defined(__GNUC__) && !defined(__clang__) // (Cyril) We have to do this because on some systems (MacOS) uintptr_t is unsigned long which is not well defined. It is always // preferable to force type serialization to the correct size rather than letting the compiler choose for us. // /!\ This structure cannot be sent over the network. The serialization would be inconsistent. @@ -295,6 +298,9 @@ struct DirStub : RsSerializable else std::cerr << __PRETTY_FUNCTION__ << ": cannot serialize raw pointer of size " << sizeof(ref) << std::endl; +#if defined(__GNUC__) && !defined(__clang__) +# pragma GCC diagnostic pop +#endif // defined(__GNUC__) && !defined(__clang__) } }; diff --git a/libretroshare/src/serialiser/rstypeserializer.h b/libretroshare/src/serialiser/rstypeserializer.h index c4f0439cf..768194a06 100644 --- a/libretroshare/src/serialiser/rstypeserializer.h +++ b/libretroshare/src/serialiser/rstypeserializer.h @@ -131,8 +131,7 @@ struct RsTypeSerializer /// Generic types template - typename std::enable_if::value - || !(std::is_base_of::value || std::is_enum::value || std::is_base_of::value || std::is_same::value)>::type + typename std::enable_if::value || !(std::is_base_of::value || std::is_enum::value || std::is_base_of::value )>::type static /*void*/ serial_process( RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext& ctx, T& member, const std::string& member_name ) From 86c8a44c95e411399a958f2687cd978e288c22fe Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 14:38:44 +0100 Subject: [PATCH 14/17] merged own travis file to allow travis compilation --- .travis.yml | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d1950e2d..373c0d834 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,19 @@ language: cpp matrix: include: + - os: linux + dist: trusty + sudo: required + compiler: gcc - os: osx osx_image: xcode9.3 compiler: clang sudo: false before_install: + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev libbz2-dev libmicrohttpd-dev libsqlite3-dev libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi - 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 @@ -22,6 +29,7 @@ before_install: - wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz - tar -xf v1.1.0.tar.gz - if [ $TRAVIS_OS_NAME == osx ]; then cp -r rapidjson-1.1.0/include/rapidjson/ /usr/local/include/rapidjson ; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo cp -r rapidjson-1.1.0/include/rapidjson/ /usr/include/rapidjson ; fi env: global: @@ -39,24 +47,38 @@ 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 script: - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi + after_success: - if [ $TRAVIS_OS_NAME == osx ]; then chmod +x ./travis_makeOSXPackage.sh && ./travis_makeOSXPackage.sh ; fi + - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j2; fi -branches: - only: - - v0.6-MacOS-Travis-Deploy2 -deploy: - provider: releases - api_key: - secure: GvA+CSM1ksvsmnkFkyWmQYcvFIJqd/fJVFGUcv/wBlrAqAWka1YRph8ox7L3+tJyISrf0MW7v+W7Rm7FOOMleeP+n4aWtFBr41R22RzlgMt6coRqho7qrNud6JkPk/Iuw2dtyMyfrTb+H+alPHs+SUnQxQ/i9Px8W7V94LTG6cim5zksNFkD7RPI94dFT/84teOEet+2NqHHuAZsf7Xfs7rk3triWPkcr7x9fzgGw/QvvKOmJwrprjmi1iKX/+cnu8adGwrmR7Q5bEvFkyChOVfiXymQQVOL4nD17PfT3fOA6u/w1pWD9jw0EsDpXP5dL8HZ6EDUoMKsUtTe2vlH40Ls+E8CA011y1VuXgRVzOzYk/TPecrW4aAmPPJJKiWnvg+URTf+A9YyphUVxwaaYXWcHWYO+zFF9N4YrOsgQAdQ+M6dg19nSPn/53VhoD4PFxS65ajBEgZi6WTwyk/AChmRXklqNHD0GOSKYW3M15BoAGh7tCrUkIhhEGmaoUsmJzA5od9H5+QxkSSS4suZFu9j8KJIthfukyF+Y1n3zDsqBS4XVYMIMno4+Jd65Qy4MQC7yPanHcpV6FOyfs7s3aXE4yUa+66iIRAr9LJDu41iLpMKUxADrAbhZwxm9vzBbQxqpJHwH6Rv9C+T5zqNuldmaRBtei05sOtD3AlJWaE= - file: retroshare-gui/src/retroshare.dmg - skip_cleanup: true - on: - repo: csoler/RetroShare - branch: v0.6-MacOS-Travis-Deploy2 +# branches: +# only: +# - v0.6-MacOS-Travis-Deploy2 + +# notifications: +# email: false +# irc: +# channels: +# - "chat.freenode.net#retroshare" +# template: +# - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" +# - "Message: %{commit_message}" +# - "Commit details: %{compare_url}" +# +# deploy: +# provider: releases +# api_key: +# secure: GvA+CSM1ksvsmnkFkyWmQYcvFIJqd/fJVFGUcv/wBlrAqAWka1YRph8ox7L3+tJyISrf0MW7v+W7Rm7FOOMleeP+n4aWtFBr41R22RzlgMt6coRqho7qrNud6JkPk/Iuw2dtyMyfrTb+H+alPHs+SUnQxQ/i9Px8W7V94LTG6cim5zksNFkD7RPI94dFT/84teOEet+2NqHHuAZsf7Xfs7rk3triWPkcr7x9fzgGw/QvvKOmJwrprjmi1iKX/+cnu8adGwrmR7Q5bEvFkyChOVfiXymQQVOL4nD17PfT3fOA6u/w1pWD9jw0EsDpXP5dL8HZ6EDUoMKsUtTe2vlH40Ls+E8CA011y1VuXgRVzOzYk/TPecrW4aAmPPJJKiWnvg+URTf+A9YyphUVxwaaYXWcHWYO+zFF9N4YrOsgQAdQ+M6dg19nSPn/53VhoD4PFxS65ajBEgZi6WTwyk/AChmRXklqNHD0GOSKYW3M15BoAGh7tCrUkIhhEGmaoUsmJzA5od9H5+QxkSSS4suZFu9j8KJIthfukyF+Y1n3zDsqBS4XVYMIMno4+Jd65Qy4MQC7yPanHcpV6FOyfs7s3aXE4yUa+66iIRAr9LJDu41iLpMKUxADrAbhZwxm9vzBbQxqpJHwH6Rv9C+T5zqNuldmaRBtei05sOtD3AlJWaE= +# file: retroshare-gui/src/retroshare.dmg +# skip_cleanup: true +# on: +# repo: csoler/RetroShare +# branch: v0.6-MacOS-Deploy From abaeac495e8a18926d084e795c7ff6e8da8c068b Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 14:43:05 +0100 Subject: [PATCH 15/17] updated travis file to comply with main repository --- .travis.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 373c0d834..3c2cb22cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ env: global: # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's public key - - secure: "GvA+CSM1ksvsmnkFkyWmQYcvFIJqd/fJVFGUcv/wBlrAqAWka1YRph8ox7L3+tJyISrf0MW7v+W7Rm7FOOMleeP+n4aWtFBr41R22RzlgMt6coRqho7qrNud6JkPk/Iuw2dtyMyfrTb+H+alPHs+SUnQxQ/i9Px8W7V94LTG6cim5zksNFkD7RPI94dFT/84teOEet+2NqHHuAZsf7Xfs7rk3triWPkcr7x9fzgGw/QvvKOmJwrprjmi1iKX/+cnu8adGwrmR7Q5bEvFkyChOVfiXymQQVOL4nD17PfT3fOA6u/w1pWD9jw0EsDpXP5dL8HZ6EDUoMKsUtTe2vlH40Ls+E8CA011y1VuXgRVzOzYk/TPecrW4aAmPPJJKiWnvg+URTf+A9YyphUVxwaaYXWcHWYO+zFF9N4YrOsgQAdQ+M6dg19nSPn/53VhoD4PFxS65ajBEgZi6WTwyk/AChmRXklqNHD0GOSKYW3M15BoAGh7tCrUkIhhEGmaoUsmJzA5od9H5+QxkSSS4suZFu9j8KJIthfukyF+Y1n3zDsqBS4XVYMIMno4+Jd65Qy4MQC7yPanHcpV6FOyfs7s3aXE4yUa+66iIRAr9LJDu41iLpMKUxADrAbhZwxm9vzBbQxqpJHwH6Rv9C+T5zqNuldmaRBtei05sOtD3AlJWaE=" + - secure: "auwuhxelaMriNaXzT8I03xrh1s+STicNyNToOWFCAYKxkWWQ4WeaCO6kRDmQrejhizMUILGU+s4FrWTEhDsviftGAF86EgzxxbSBfsHHAP4t2C0pcXX8/WxEoh1IrUs7iGCIpl7O2cvWqGidc20ROeptSEd1uQgkHnn14D9A2YmXf8g52PzqivKkb6HKfkVTPdmNJkMBT5eDtEw6DIk+DvnvRo6b6uanvVAKS9CBwXOdA3rLzaD9bz0LrdL9X1CNoTkGROyez0Lsc4zTr70id2Xfp1MMmJAV6hgQy+iwE37wRyrxJf3dkh5SUAAMUC9Xnvh/iBKNQKdQGhj2WGcV7GZV9k6u9DA1w2H0kcrwt9KHUXdhEQ67yr6Boa9ZFwdDb5VIOtC6iHAoDZXharHhiuxi0K/bCtwNAajrMjBCm9mWhEKvtoxUUYxAJajhJkkO3ERaOU3zHE+06esDzGozd2YOEH8a74HhYy4xvhR05Yj00hAWLS2kIaUITiqmBf6Yuh5XwH7KCDcapxF59ROWqyicdwtbfWpvN8IvFuGKyxYuEfoT8WxZ4lZpo4Q9CrTB7gedJYJxYNfZE/okWoFBb4cpPI94PHo3DZPR7lVyQ60RNyeR0nOeqf8NW8cBT1G4jw3u1LEyAdyvup+54aALw0DCVyoDojSXB8s+AlQG2JE=" addons: coverity_scan: @@ -62,23 +62,23 @@ after_success: # only: # - v0.6-MacOS-Travis-Deploy2 -# notifications: -# email: false -# irc: -# channels: -# - "chat.freenode.net#retroshare" -# template: -# - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" -# - "Message: %{commit_message}" -# - "Commit details: %{compare_url}" -# -# deploy: -# provider: releases -# api_key: -# secure: GvA+CSM1ksvsmnkFkyWmQYcvFIJqd/fJVFGUcv/wBlrAqAWka1YRph8ox7L3+tJyISrf0MW7v+W7Rm7FOOMleeP+n4aWtFBr41R22RzlgMt6coRqho7qrNud6JkPk/Iuw2dtyMyfrTb+H+alPHs+SUnQxQ/i9Px8W7V94LTG6cim5zksNFkD7RPI94dFT/84teOEet+2NqHHuAZsf7Xfs7rk3triWPkcr7x9fzgGw/QvvKOmJwrprjmi1iKX/+cnu8adGwrmR7Q5bEvFkyChOVfiXymQQVOL4nD17PfT3fOA6u/w1pWD9jw0EsDpXP5dL8HZ6EDUoMKsUtTe2vlH40Ls+E8CA011y1VuXgRVzOzYk/TPecrW4aAmPPJJKiWnvg+URTf+A9YyphUVxwaaYXWcHWYO+zFF9N4YrOsgQAdQ+M6dg19nSPn/53VhoD4PFxS65ajBEgZi6WTwyk/AChmRXklqNHD0GOSKYW3M15BoAGh7tCrUkIhhEGmaoUsmJzA5od9H5+QxkSSS4suZFu9j8KJIthfukyF+Y1n3zDsqBS4XVYMIMno4+Jd65Qy4MQC7yPanHcpV6FOyfs7s3aXE4yUa+66iIRAr9LJDu41iLpMKUxADrAbhZwxm9vzBbQxqpJHwH6Rv9C+T5zqNuldmaRBtei05sOtD3AlJWaE= -# file: retroshare-gui/src/retroshare.dmg -# skip_cleanup: true -# on: -# repo: csoler/RetroShare -# branch: v0.6-MacOS-Deploy +notifications: + email: false + irc: + channels: + - "chat.freenode.net#retroshare" + template: + - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" + - "Message: %{commit_message}" + - "Commit details: %{compare_url}" + +deploy: + provider: releases + api_key: + secure: auwuhxelaMriNaXzT8I03xrh1s+STicNyNToOWFCAYKxkWWQ4WeaCO6kRDmQrejhizMUILGU+s4FrWTEhDsviftGAF86EgzxxbSBfsHHAP4t2C0pcXX8/WxEoh1IrUs7iGCIpl7O2cvWqGidc20ROeptSEd1uQgkHnn14D9A2YmXf8g52PzqivKkb6HKfkVTPdmNJkMBT5eDtEw6DIk+DvnvRo6b6uanvVAKS9CBwXOdA3rLzaD9bz0LrdL9X1CNoTkGROyez0Lsc4zTr70id2Xfp1MMmJAV6hgQy+iwE37wRyrxJf3dkh5SUAAMUC9Xnvh/iBKNQKdQGhj2WGcV7GZV9k6u9DA1w2H0kcrwt9KHUXdhEQ67yr6Boa9ZFwdDb5VIOtC6iHAoDZXharHhiuxi0K/bCtwNAajrMjBCm9mWhEKvtoxUUYxAJajhJkkO3ERaOU3zHE+06esDzGozd2YOEH8a74HhYy4xvhR05Yj00hAWLS2kIaUITiqmBf6Yuh5XwH7KCDcapxF59ROWqyicdwtbfWpvN8IvFuGKyxYuEfoT8WxZ4lZpo4Q9CrTB7gedJYJxYNfZE/okWoFBb4cpPI94PHo3DZPR7lVyQ60RNyeR0nOeqf8NW8cBT1G4jw3u1LEyAdyvup+54aALw0DCVyoDojSXB8s+AlQG2JE= + file: retroshare-gui/src/retroshare.dmg + skip_cleanup: true + on: + repo: retroshare/RetroShare + branch: v0.6-MacOS-Deploy From 51112c8df8fb066fa4cc3e50ddf8b2be951b04e4 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 14:48:03 +0100 Subject: [PATCH 16/17] fixed branch name for OSX deploy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c2cb22cf..c953a07cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,5 +80,5 @@ deploy: skip_cleanup: true on: repo: retroshare/RetroShare - branch: v0.6-MacOS-Deploy + branch: v0.6-OSX-Deploy From 2d03ffa85c55ae90f3464e6c6bfd5019865441fe Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 25 Jan 2019 15:08:36 +0100 Subject: [PATCH 17/17] removed tabs from travis file --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c953a07cf..aebcc220b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ language: cpp matrix: include: - - os: linux + - os: linux dist: trusty - sudo: required - compiler: gcc + sudo: required + compiler: gcc - os: osx osx_image: xcode9.3 compiler: clang