From b1319aae79418c2ca6395f96416f3aeac29afbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 10:56:36 +0200 Subject: [PATCH 1/8] Try to build dragndrop installer for OpenMesh on Mac containing release and debug version --- CI/ci-mac.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh index b580c59f..61d5cbbc 100755 --- a/CI/ci-mac.sh +++ b/CI/ci-mac.sh @@ -78,7 +78,7 @@ fi 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 make @@ -191,3 +191,21 @@ else echo -e "${NC}" fi + +cd .. +cd .. + +echo -e "${OUTPUT}" +echo "" +echo "======================================================================" +echo "Package creation" +echo "======================================================================" +echo -e "${NC}" + +cd build-release-$BUILDPATH +cp ../build-debug-$BUILDPATH/Build/lib/* ./Build/lib/ +cmake . +make package + + + -- GitLab From 33cdd611ab4ec9fb4fdecaed826bda48b876b0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 11:01:33 +0200 Subject: [PATCH 2/8] More verbose ci output for configuration --- CI/ci-mac.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh index 61d5cbbc..9d015196 100755 --- a/CI/ci-mac.sh +++ b/CI/ci-mac.sh @@ -13,11 +13,11 @@ OPTIONS="" if [ "$LANGUAGE" == "C++98" ]; then echo "Building with C++98"; - BUILDPATH="$BUILDPATH-cpp98" + BUILDPATH="cpp98" elif [ "$LANGUAGE" == "C++11" ]; then echo "Building with C++11"; OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' " - BUILDPATH="$BUILDPATH-cpp11" + BUILDPATH="cpp11" fi #===================================== @@ -28,6 +28,18 @@ OUTPUT='\033[0;32m' 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 "" echo "======================================================================" @@ -108,7 +120,7 @@ else echo -e "${NC}" fi - +OPTIONS= cd .. -- GitLab From 80316d61ea62280ff1b13c36f580f9391f1177b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 11:10:21 +0200 Subject: [PATCH 3/8] Archive created dmg files from mac --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a38eb46b..097ce3b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,17 @@ macos-c++11: script: "CI/ci-mac.sh C++11" tags: - Apple + artifacts: + paths: + - *.dmg macos-c++98: script: "CI/ci-mac.sh C++98" tags: - Apple + artifacts: + paths: + - *.dmg cppcheck: script: "CI/ci-cppcheck.sh" -- GitLab From d71aabad49c62dc7557781f669667db9a2e2ccc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 11:33:20 +0200 Subject: [PATCH 4/8] Fixed bug on cpp98 build which does not run some python unittests --- CI/ci-mac.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh index 9d015196..e3c4d92b 100755 --- a/CI/ci-mac.sh +++ b/CI/ci-mac.sh @@ -120,7 +120,6 @@ else echo -e "${NC}" fi -OPTIONS= cd .. @@ -196,6 +195,9 @@ if [ "$LANGUAGE" == "C++11" ]; then rm -f openmesh.so cp ../Build/python/openmesh.so . python -m unittest discover -v + + cd .. + else echo -e "${WARNING}" @@ -203,8 +205,7 @@ else echo -e "${NC}" fi - -cd .. + cd .. echo -e "${OUTPUT}" -- GitLab From a662f25031ab7fb25a70d11d8fa929ca8a9e1023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 11:35:24 +0200 Subject: [PATCH 5/8] Wrong artifact location fixed --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 097ce3b6..4f6a2bb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ macos-c++11: - Apple artifacts: paths: - - *.dmg + - build-release-cpp11/*.dmg macos-c++98: script: "CI/ci-mac.sh C++98" @@ -32,7 +32,7 @@ macos-c++98: - Apple artifacts: paths: - - *.dmg + - build-release-cpp98/*.dmg cppcheck: script: "CI/ci-cppcheck.sh" -- GitLab From e686317117e97c110f837ff7c9edfc29889bc861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 11:37:47 +0200 Subject: [PATCH 6/8] Artifact archive for tar gz as well --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f6a2bb7..ea81f47e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ macos-c++11: artifacts: paths: - build-release-cpp11/*.dmg + - build-release-cpp11/*.tar.gz macos-c++98: script: "CI/ci-mac.sh C++98" @@ -33,6 +34,7 @@ macos-c++98: artifacts: paths: - build-release-cpp98/*.dmg + - build-release-cpp98/*.tar.gz cppcheck: script: "CI/ci-cppcheck.sh" -- GitLab From 3a47e52afabb31399b7ad29d9917758f59cf75f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 12:31:50 +0200 Subject: [PATCH 7/8] Retrigger --- CI/ci-mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh index e3c4d92b..5ea9c755 100755 --- a/CI/ci-mac.sh +++ b/CI/ci-mac.sh @@ -211,7 +211,7 @@ cd .. echo -e "${OUTPUT}" echo "" echo "======================================================================" -echo "Package creation" +echo "Package creation (DMG and tarball)" echo "======================================================================" echo -e "${NC}" -- GitLab From aafa29445a8e652f3bdfa7dc4ef2030af5ff3763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 May 2016 12:34:55 +0200 Subject: [PATCH 8/8] More verbose output on linux --- CI/ci-linux.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CI/ci-linux.sh b/CI/ci-linux.sh index 0fb2d6ff..b8d3162a 100755 --- a/CI/ci-linux.sh +++ b/CI/ci-linux.sh @@ -43,6 +43,21 @@ OUTPUT='\033[0;32m' 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 "" echo "======================================================================" -- GitLab