Commit f3691620 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'ci_mac' into 'master'

Ci mac

See merge request !188
parents 75c42b38 517a39b6
Pipeline #3490 passed with stage
in 105 minutes and 19 seconds
......@@ -45,3 +45,14 @@ VS2013-Qt-5.5.1-x64:
artifacts:
paths:
- rel/*.exe
Mac-Cpp11:
script: "CI/ci-mac.sh"
cache:
paths:
- build-release/
tags:
- Apple
artifacts:
paths:
- build-release/*.dmg
......@@ -65,7 +65,7 @@
#if defined(ARCH_DARWIN)
#include <gl/glew.h>
#include <GL/glew.h>
#elif defined(WIN32)
......
########################################
# Fetch submodules
########################################
git submodule init
git submodule update --remote
########################################
# Fetch test data
########################################
rm -rf TestData
git clone git@roosevelt:moebius/OpenFlipper-Test-Data.git TestData
########################################
# Build
########################################
if [ ! -d build-release ]; then
mkdir build-release
fi
cd build-release
# Build without ports to avoid qt4 collision
/opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework -DQT5_INSTALL_PATH=/Qt/Qt5.5.1/5.5/clang_64 -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
make
# Required for the tests to build, if a package was generated
make fixbundle
########################################
# Test
########################################
# Run tests
cd tests
bash run_tests.sh
cd ..
########################################
# Doc
########################################
make doc >> ../Doxygen-warning.log 2> ../Doxygen-error.log
########################################
# Package
########################################
rm -f *.dmg
make OpenFlipper_package
mv *.dmg OpenFlipper-Free-GIT-$CI_BUILD_REF-QT5.5.1-CPP11.dmg
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment