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

Merge branch 'MacOS_installer' into 'master'

Mac os installer



See merge request !63
parents a5dbe44e aafa2944
Pipeline #1757 passed with stage
...@@ -22,11 +22,19 @@ macos-c++11: ...@@ -22,11 +22,19 @@ macos-c++11:
script: "CI/ci-mac.sh C++11" script: "CI/ci-mac.sh C++11"
tags: tags:
- Apple - Apple
artifacts:
paths:
- build-release-cpp11/*.dmg
- build-release-cpp11/*.tar.gz
macos-c++98: macos-c++98:
script: "CI/ci-mac.sh C++98" script: "CI/ci-mac.sh C++98"
tags: tags:
- Apple - Apple
artifacts:
paths:
- build-release-cpp98/*.dmg
- build-release-cpp98/*.tar.gz
cppcheck: cppcheck:
script: "CI/ci-cppcheck.sh" script: "CI/ci-cppcheck.sh"
......
...@@ -43,6 +43,21 @@ OUTPUT='\033[0;32m' ...@@ -43,6 +43,21 @@ OUTPUT='\033[0;32m'
WARNING='\033[0;93m' WARNING='\033[0;93m'
echo -e "${OUTPUT}"
echo ""
echo "======================================================================"
echo "Basic configuration details:"
echo "======================================================================"
echo -e "${NC}"
echo "Compiler: $COMPILER"
echo "Options: $OPTIONS"
echo "Language: $LANGUAGE"
echo "Make Options: $OPTIONS"
echo "BuildPath: $BUILDPATH"
echo "Path: $PATH"
echo "Language: $LANGUAGE"
echo -e "${OUTPUT}" echo -e "${OUTPUT}"
echo "" echo ""
echo "======================================================================" echo "======================================================================"
......
...@@ -13,11 +13,11 @@ OPTIONS="" ...@@ -13,11 +13,11 @@ OPTIONS=""
if [ "$LANGUAGE" == "C++98" ]; then if [ "$LANGUAGE" == "C++98" ]; then
echo "Building with C++98"; echo "Building with C++98";
BUILDPATH="$BUILDPATH-cpp98" BUILDPATH="cpp98"
elif [ "$LANGUAGE" == "C++11" ]; then elif [ "$LANGUAGE" == "C++11" ]; then
echo "Building with C++11"; echo "Building with C++11";
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' " OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
BUILDPATH="$BUILDPATH-cpp11" BUILDPATH="cpp11"
fi fi
#===================================== #=====================================
...@@ -28,6 +28,18 @@ OUTPUT='\033[0;32m' ...@@ -28,6 +28,18 @@ OUTPUT='\033[0;32m'
WARNING='\033[0;93m' WARNING='\033[0;93m'
echo -e "${OUTPUT}"
echo ""
echo "======================================================================"
echo "Basic configuration details:"
echo "======================================================================"
echo -e "${NC}"
echo "Options: $OPTIONS"
echo "BuildPath: $BUILDPATH"
echo "Path: $PATH"
echo "Language: $LANGUAGE"
echo -e "${OUTPUT}" echo -e "${OUTPUT}"
echo "" echo ""
echo "======================================================================" echo "======================================================================"
...@@ -78,7 +90,7 @@ fi ...@@ -78,7 +90,7 @@ fi
cd build-release-$BUILDPATH cd build-release-$BUILDPATH
cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON -DBUILD_APPS=OFF $OPTIONS ../ cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON -DBUILD_APPS=OFF -DCPACK_BINARY_DRAGNDROP=ON $OPTIONS ../
#build it #build it
make make
...@@ -108,7 +120,6 @@ else ...@@ -108,7 +120,6 @@ else
echo -e "${NC}" echo -e "${NC}"
fi fi
cd .. cd ..
...@@ -184,6 +195,9 @@ if [ "$LANGUAGE" == "C++11" ]; then ...@@ -184,6 +195,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
rm -f openmesh.so rm -f openmesh.so
cp ../Build/python/openmesh.so . cp ../Build/python/openmesh.so .
python -m unittest discover -v python -m unittest discover -v
cd ..
else else
echo -e "${WARNING}" echo -e "${WARNING}"
...@@ -191,3 +205,20 @@ else ...@@ -191,3 +205,20 @@ else
echo -e "${NC}" echo -e "${NC}"
fi fi
cd ..
echo -e "${OUTPUT}"
echo ""
echo "======================================================================"
echo "Package creation (DMG and tarball)"
echo "======================================================================"
echo -e "${NC}"
cd build-release-$BUILDPATH
cp ../build-debug-$BUILDPATH/Build/lib/* ./Build/lib/
cmake .
make package
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