mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update .travis.yml

This commit is contained in:
Chris Esposito 2019-04-01 19:56:07 +11:00 committed by GitHub
parent 888776c09a
commit cea118a00d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -50,7 +50,7 @@ script:
# OSX # OSX
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cd Desktop_Interface cd Desktop_Interface
qmake CONFIG+=release PREFIX=/usr qmake CONFIG+=release PREFIX=/usr DEFINES+="GIT_HASH_SHORT=$(git rev-parse --short HEAD)"
make -j$(sysctl -n hw.ncpu) make -j$(sysctl -n hw.ncpu)
mkdir -p bin/Labrador.app/Contents/MacOS/Resources mkdir -p bin/Labrador.app/Contents/MacOS/Resources
mkdir -p bin/Labrador.app/Contents/Frameworks mkdir -p bin/Labrador.app/Contents/Frameworks
@ -62,7 +62,7 @@ script:
#Linux #Linux
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
cd Desktop_Interface cd Desktop_Interface
qmake CONFIG+=release PREFIX=/usr qmake CONFIG+=release PREFIX=/usr DEFINES+="GIT_HASH_SHORT=$(git rev-parse --short HEAD)"
make -j$(nproc) CXX=${CXX} CC=${CC} LINK=${CXX} make -j$(nproc) CXX=${CXX} CC=${CC} LINK=${CXX}
# - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ # - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
# NOTE: The following 5 lines should not be needed if "make install" would be made work for Labrador; see # NOTE: The following 5 lines should not be needed if "make install" would be made work for Labrador; see