From f8a05ae8d1bd3e0232241e83a28fad86c042ddba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 2 Dec 2013 19:56:05 +0100 Subject: [PATCH] package: add GCC 4.5 and 4.4 to Jenkins CI configuration. --- doc/building.dox | 12 ++++++------ package/ci/jenkins-gltests.xml | 6 ++++-- package/ci/jenkins.xml | 14 ++++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/doc/building.dox b/doc/building.dox index b9ec78731..8e83ef153 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -393,15 +393,15 @@ GL tests only. Setup your Jenkins server, enable the **Git** and Then add new jobs or update existing ones (replace `` with `create-job` or `update-job`). - java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum < jenkins.xml - java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-GLTests < jenkins-gltests.xml + java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-Compatibility < jenkins.xml + java -jar jenkins-cli.jar -s http://your-jenkins-server Magnum-Compatibility-GLTests < jenkins-gltests.xml Build is done using **Ninja** build system and everything possible is enabled, thus you need also **SDL2**, **GLUT** and **OpenAL** libraries. It expects that -**GCC** >=4.8.2, 4.7, 4.6 and **Clang** are installed and there are **OpenGL**, -**OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to compile the -library with every combination of them. You can add/remove the axes in -`axes/hudson.matrix.TextAxis` or via the web interface later. +**GCC** >=4.8.2, 4.7, 4.6, 4.5, 4.4 and **Clang** are installed and there are +**OpenGL**, **OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to +compile the library with every combination of them. You can add/remove the axes +in `axes/hudson.matrix.TextAxis` or via the web interface later. Magnum-GLTests depend on active X11 session, thus they should be run from Jenkins instance running on graphical user session. diff --git a/package/ci/jenkins-gltests.xml b/package/ci/jenkins-gltests.xml index 581872d5e..239d14e4d 100644 --- a/package/ci/jenkins-gltests.xml +++ b/package/ci/jenkins-gltests.xml @@ -19,7 +19,7 @@ - */master + compatibility false @@ -37,7 +37,7 @@ false false - Magnum + Magnum-Compatibility compiler @@ -45,6 +45,8 @@ g++ g++-4.7 g++-4.6 + g++-4.5 + g++-4.4 clang++ clang++-libc++ diff --git a/package/ci/jenkins.xml b/package/ci/jenkins.xml index 05ed62e86..dd3941a28 100644 --- a/package/ci/jenkins.xml +++ b/package/ci/jenkins.xml @@ -19,7 +19,7 @@ - */master + compatibility false @@ -37,7 +37,7 @@ false false - Magnum + Magnum-Compatibility compiler @@ -45,6 +45,8 @@ g++ g++-4.7 g++-4.6 + g++-4.5 + g++-4.4 clang++ clang++-libc++ @@ -116,9 +118,9 @@ cd build-${compiler}-${libraries}-${compatibility}-${gl} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/${compiler}-${libraries} \ - -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl} \ - -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/${compiler}-${libraries}/lib;${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl}/lib" \ + -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries} \ + -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries}-${compatibility}-${gl} \ + -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries}/lib;${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries}-${compatibility}-${gl}/lib" \ -DCMAKE_CXX_COMPILER=${compiler_binary} \ "${compiler_flags[@]}" \ -DBUILD_TESTS=ON \ @@ -149,7 +151,7 @@ ninja install - Magnum-GLTests + Magnum-Compatibility-GLTests SUCCESS 0