Browse Source

package: add GCC 4.5 and 4.4 to Jenkins CI configuration.

Vladimír Vondruš 13 years ago
parent
commit
f8a05ae8d1
  1. 12
      doc/building.dox
  2. 6
      package/ci/jenkins-gltests.xml
  3. 14
      package/ci/jenkins.xml

12
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 `<command>` with `create-job` Then add new jobs or update existing ones (replace `<command>` with `create-job`
or `update-job`). or `update-job`).
java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum < jenkins.xml java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-Compatibility < jenkins.xml
java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-GLTests < jenkins-gltests.xml java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-Compatibility-GLTests < jenkins-gltests.xml
Build is done using **Ninja** build system and everything possible is enabled, Build is done using **Ninja** build system and everything possible is enabled,
thus you need also **SDL2**, **GLUT** and **OpenAL** libraries. It expects that 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**, **GCC** >=4.8.2, 4.7, 4.6, 4.5, 4.4 and **Clang** are installed and there are
**OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to compile the **OpenGL**, **OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to
library with every combination of them. You can add/remove the axes in compile the library with every combination of them. You can add/remove the axes
`axes/hudson.matrix.TextAxis` or via the web interface later. in `axes/hudson.matrix.TextAxis` or via the web interface later.
Magnum-GLTests depend on active X11 session, thus they should be run from Magnum-GLTests depend on active X11 session, thus they should be run from
Jenkins instance running on graphical user session. Jenkins instance running on graphical user session.

6
package/ci/jenkins-gltests.xml

@ -19,7 +19,7 @@
</userRemoteConfigs> </userRemoteConfigs>
<branches> <branches>
<hudson.plugins.git.BranchSpec> <hudson.plugins.git.BranchSpec>
<name>*/master</name> <name>compatibility</name>
</hudson.plugins.git.BranchSpec> </hudson.plugins.git.BranchSpec>
</branches> </branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@ -37,7 +37,7 @@
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers/> <triggers/>
<concurrentBuild>false</concurrentBuild> <concurrentBuild>false</concurrentBuild>
<customWorkspace>Magnum</customWorkspace> <customWorkspace>Magnum-Compatibility</customWorkspace>
<axes> <axes>
<hudson.matrix.TextAxis> <hudson.matrix.TextAxis>
<name>compiler</name> <name>compiler</name>
@ -45,6 +45,8 @@
<string>g++</string> <string>g++</string>
<string>g++-4.7</string> <string>g++-4.7</string>
<string>g++-4.6</string> <string>g++-4.6</string>
<string>g++-4.5</string>
<string>g++-4.4</string>
<string>clang++</string> <string>clang++</string>
<string>clang++-libc++</string> <string>clang++-libc++</string>
</values> </values>

14
package/ci/jenkins.xml

@ -19,7 +19,7 @@
</userRemoteConfigs> </userRemoteConfigs>
<branches> <branches>
<hudson.plugins.git.BranchSpec> <hudson.plugins.git.BranchSpec>
<name>*/master</name> <name>compatibility</name>
</hudson.plugins.git.BranchSpec> </hudson.plugins.git.BranchSpec>
</branches> </branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@ -37,7 +37,7 @@
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers/> <triggers/>
<concurrentBuild>false</concurrentBuild> <concurrentBuild>false</concurrentBuild>
<customWorkspace>Magnum</customWorkspace> <customWorkspace>Magnum-Compatibility</customWorkspace>
<axes> <axes>
<hudson.matrix.TextAxis> <hudson.matrix.TextAxis>
<name>compiler</name> <name>compiler</name>
@ -45,6 +45,8 @@
<string>g++</string> <string>g++</string>
<string>g++-4.7</string> <string>g++-4.7</string>
<string>g++-4.6</string> <string>g++-4.6</string>
<string>g++-4.5</string>
<string>g++-4.4</string>
<string>clang++</string> <string>clang++</string>
<string>clang++-libc++</string> <string>clang++-libc++</string>
</values> </values>
@ -116,9 +118,9 @@ cd build-${compiler}-${libraries}-${compatibility}-${gl}
cmake .. \ cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/${compiler}-${libraries} \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries} \
-DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries}-${compatibility}-${gl} \
-DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/${compiler}-${libraries}/lib;${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl}/lib" \ -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries}/lib;${JENKINS_HOME}/filesystem/compatibility-${compiler}-${libraries}-${compatibility}-${gl}/lib" \
-DCMAKE_CXX_COMPILER=${compiler_binary} \ -DCMAKE_CXX_COMPILER=${compiler_binary} \
"${compiler_flags[@]}" \ "${compiler_flags[@]}" \
-DBUILD_TESTS=ON \ -DBUILD_TESTS=ON \
@ -149,7 +151,7 @@ ninja install
</builders> </builders>
<publishers> <publishers>
<hudson.tasks.BuildTrigger> <hudson.tasks.BuildTrigger>
<childProjects>Magnum-GLTests</childProjects> <childProjects>Magnum-Compatibility-GLTests</childProjects>
<threshold> <threshold>
<name>SUCCESS</name> <name>SUCCESS</name>
<ordinal>0</ordinal> <ordinal>0</ordinal>

Loading…
Cancel
Save