TavisCI OSX add miniupnpc include and lib path

This commit is contained in:
Gioacchino Mazzurco 2019-11-28 15:48:17 +01:00
parent 722b1dbffc
commit 6bae8237e1
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
4 changed files with 29 additions and 6 deletions

View File

@ -16,13 +16,21 @@ matrix:
before_install: before_install:
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi - 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 libsqlite3-dev libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev rapidjson-dev ; fi - >
if [ $TRAVIS_OS_NAME == linux ]; then
sudo apt-get install -y
build-essential libssl-dev libsqlcipher-dev libbz2-dev libsqlite3-dev
libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev
libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev
rapidjson-dev ;
fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew install ccache; 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 install qt5; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt5 ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt5 ; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl miniupnpc rapidjson sqlcipher xapian cmark; fi - >
if [ $TRAVIS_OS_NAME == osx ]; then
brew install openssl miniupnpc rapidjson sqlcipher xapian cmark;
fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew install p7zip; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install p7zip; fi
- if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi - if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi
@ -44,7 +52,17 @@ addons:
before_script: before_script:
- env - env
- if [ $TRAVIS_OS_NAME == linux ]; then qmake; fi - if [ $TRAVIS_OS_NAME == linux ]; then qmake; fi
- if [ $TRAVIS_OS_NAME == osx ]; then qmake CONFIG+=rs_macos10.14 INCLUDEPATH+=$(find /usr/local/Cellar/openssl*/*/include/ | head -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/rapidjson/*/include | head -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/openssl*/*/lib/ | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib | head -n 1); fi - >
if [ $TRAVIS_OS_NAME == osx ]; then
qmake CONFIG+=rs_macos10.14
INCLUDEPATH+=$(find /usr/local/Cellar/miniupnpc/*/include | head -n 1)
QMAKE_LIBDIR+=$(find /usr/local/Cellar/miniupnpc/*/lib/ | head -n 1)
INCLUDEPATH+=$(find /usr/local/Cellar/openssl*/*/include/ | head -n 1)
QMAKE_LIBDIR+=$(find /usr/local/Cellar/openssl*/*/lib/ | head -n 1)
INCLUDEPATH+=$(find /usr/local/Cellar/rapidjson/*/include | head -n 1)
INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | head -n 1)
QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib | head -n 1);
fi
script: script:
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi

View File

@ -19,6 +19,10 @@ updated documentation on how to build retroshare, instead we provide scripts and
receipts that are used to create the packages for the supported platforms and receipts that are used to create the packages for the supported platforms and
more in the `build_scripts` directory of this repository. more in the `build_scripts` directory of this repository.
Those packaging receipts toghether with the continuous integration files
`.travis.yml` and `appveyor.yml` are a good source of knoweldge on how to
compile retroshare on different platforms.
== Using RetroShare on a headless computer with WebUI == Using RetroShare on a headless computer with WebUI

View File

@ -16,6 +16,8 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>. # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
################################################################################ ################################################################################
CONFIG += c++11
!include("retroshare.pri"): error("Could not include file retroshare.pri") !include("retroshare.pri"): error("Could not include file retroshare.pri")
TEMPLATE = subdirs TEMPLATE = subdirs

View File

@ -18,7 +18,6 @@
RS_SRC_PATH=$$clean_path($${PWD}/../../) RS_SRC_PATH=$$clean_path($${PWD}/../../)
RS_BUILD_PATH=$$clean_path($${OUT_PWD}/../../) RS_BUILD_PATH=$$clean_path($${OUT_PWD}/../../)
CONFIG += c++11
DEPENDPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src/) DEPENDPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src/)
INCLUDEPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src) INCLUDEPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src)
LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare