From 0df27b567b091c6e6678a4afdc389578b10f410a Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 15 Jul 2021 11:50:37 +0300 Subject: [PATCH] add windows32 --- Jenkinsfile | 40 +++++++++++++++---------------- docker/windows32-shstk/Dockerfile | 21 ++++++++++++++++ 2 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 docker/windows32-shstk/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index ea20aba..bc43c82 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,40 +1,40 @@ def build_docker(name) { - def image = "${name}-shstk" - echo "Build image ${image}" + def image = "${name}-shstk" + echo "Build image ${image}" def pref = "" - if (env.DOCKER_PREFIX) { - pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" + if (env.DOCKER_PREFIX) { + pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } def jobs = 4 - if (env.JOBS_COUNT) { - jobs = "${env.JOBS_COUNT}" + if (env.JOBS_COUNT) { + jobs = "${env.JOBS_COUNT}" } def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}" dir ("docker/${image}") { - sh "docker build ${args} --no-cache -t ${image} ." - } + sh "docker build ${args} --no-cache -t ${image} ." + } return "\n - ${image}" } node { stage("checkout") { checkout scm } - def _envmap = [:] - def _env = sh(script: "env", returnStdout: true).trim().split("\n") - _env.each{ l -> - def _ind = l.indexOf('='); - def _n = l.substring(0, _ind); - def _v = l.substring(_ind + 1); - _envmap["${_n}"] = "${_v}"; - } + def _envmap = [:] + def _env = sh(script: "env", returnStdout: true).trim().split("\n") + _env.each{ l -> + def _ind = l.indexOf('='); + def _n = l.substring(0, _ind); + def _v = l.substring(_ind + 1); + _envmap["${_n}"] = "${_v}"; + } def _msg = "Built images:" - def platforms = ['debian', 'osx', 'windows', 'android', 'pi', 'ubuntu'] + def platforms = ['debian', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu'] for (int i = 0; i < platforms.size(); ++i) { - if (_envmap["BUILD_${platforms[i]}"] == "1") { + if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-shstk") { _msg += build_docker("${platforms[i]}") } - } + } } sh "docker system prune -f" echo "${_msg}" @@ -46,7 +46,7 @@ pipeline { options { copyArtifactPermission('*'); } - stages { + stages { stage("PIP doc") { steps { checkout scm diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile new file mode 100644 index 0000000..017485f --- /dev/null +++ b/docker/windows32-shstk/Dockerfile @@ -0,0 +1,21 @@ +ARG DOCKER_PREFIX=wapmobil/ +FROM ${DOCKER_PREFIX}windows32 + +ARG LIBS_BUILD_NUMBER=9999 +ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH + +WORKDIR /soft +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git + +WORKDIR /soft/shstk_build_host +RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && make install -j${JOBS_COUNT} \ + && rm -rf * \ + && ldconfig + +WORKDIR /soft/shstk_build_windows32 +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \ + && make install -j${JOBS_COUNT} && rm -rf * + +WORKDIR /soft/src