Merge branch 'master' into compatibility

doc/building.dox

@@ -504,14 +504,15 @@ in `axes/hudson.matrix.TextAxis` or via the web interface later.
 Magnum-Compatibility-GLTests depend on active X11 session, thus they should be
 run from Jenkins instance running on graphical user session.
 
-There is also MinGW-w64, Emscripten and NaCl configuration, add or update them
+There is also MinGW-w64, Emscripten, NaCl and Android configuration, add or
-with the commands below. See @ref building-crosscompiling for more information
+update them with the commands below. See @ref building-crosscompiling for more
-about setting up the crosscompilers and `toolchains/` submodule. For Emscripten
+information about setting up the crosscompilers and `toolchains/` submodule.
-you need also **Node.js** installed to run the tests.
+For Emscripten you need also **Node.js** installed to run the tests.
 
     java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-MinGW-w64 < jenkins-mingw-w64.xml
     java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-Emscripten < jenkins-emscripten.xml
     java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-NaCl < jenkins-nacl.xml
+    java -jar jenkins-cli.jar -s http://your-jenkins-server <command> Magnum-Android < jenkins-android.xml
 */
 
 }

package/ci/jenkins-android.xml

@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+  <actions/>
+  <description></description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@2.0">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>git://github.com/mosra/magnum.git</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>*/master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.CloneOption>
+        <shallow>true</shallow>
+        <reference></reference>
+      </hudson.plugins.git.extensions.impl.CloneOption>
+    </extensions>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <customWorkspace>Magnum</customWorkspace>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>toolchain</name>
+      <values>
+        <string>ARM</string>
+        <string>x86</string>
+      </values>
+    </hudson.matrix.TextAxis>
+    <hudson.matrix.TextAxis>
+      <name>compatibility</name>
+      <values>
+        <string></string>
+        <string>deprecated</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>
+<![CDATA[
+git submodule init
+git submodule update
+
+if [ "${compatibility}" = "deprecated" ] ; then
+    deprecated_build_flag=ON
+else
+    deprecated_build_flag=OFF
+fi
+
+mkdir -p build-nacl-${toolchain}-${compatibility}
+cd build-nacl-${toolchain}-${compatibility}
+
+cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \
+    -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/Android-${toolchain}.cmake \
+    -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \
+    -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \
+    -DBUILD_DEPRECATED=${deprecated_build_flag} \
+  `#-DWITH_AUDIO=ON` \
+    -DWITH_ANDROIDAPPLICATION=ON \
+    -DWITH_MAGNUMFONT=ON \
+    -DWITH_MAGNUMFONTCONVERTER=ON \
+    -DWITH_OBJIMPORTER=ON \
+    -DWITH_TGAIMAGECONVERTER=ON \
+    -DWITH_TGAIMPORTER=ON \
+  `#-DWITH_WAVAUDIOIMPORTER=ON` \
+  `#-DWITH_MAGNUMINFO=ON` \
+    -G Ninja
+
+ninja
+ninja install/strip
+]]>
+    </command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.plugins.textfinder.TextFinderPublisher plugin="text-finder@1.9">
+      <regexp>Errors while running CTest</regexp>
+      <succeedIfFound>false</succeedIfFound>
+      <unstableIfFound>true</unstableIfFound>
+      <alsoCheckConsoleOutput>true</alsoCheckConsoleOutput>
+    </hudson.plugins.textfinder.TextFinderPublisher>
+  </publishers>
+  <buildWrappers/>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>true</runSequentially>
+    <touchStoneCombinationFilter>
+<![CDATA[
+toolchain == "ARM" && compatibility == "deprecated"
+]]>
+    </touchStoneCombinationFilter>
+    <touchStoneResultCondition>
+      <name>UNSTABLE</name>
+      <ordinal>1</ordinal>
+      <color>YELLOW</color>
+      <completeBuild>true</completeBuild>
+    </touchStoneResultCondition>
+  </executionStrategy>
+  <childCustomWorkspace>.</childCustomWorkspace>
+</matrix-project>