Compare commits
86 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d075e7cd6 | |||
| a26c2b87f3 | |||
| 6cf9410e2f | |||
| 9db977f7d5 | |||
| 2b61d631da | |||
| d714fbff19 | |||
| 3288d32411 | |||
| 676d57a7d8 | |||
| 836c4b956d | |||
| 10e9c1b140 | |||
| 9bb63cdaf3 | |||
| 736972b8e4 | |||
| 7b03919deb | |||
| 00fe1dfa03 | |||
| 1a3945f436 | |||
| bea339e3f5 | |||
| f2e2c77552 | |||
| 29736b3b2a | |||
| 32d834882c | |||
| a2c377f784 | |||
| aee673d02e | |||
| 0653392576 | |||
| d373e3b539 | |||
| f42df80891 | |||
| 82e1ec849f | |||
| d2903884de | |||
| 2ef3c2cb61 | |||
| c04d8b138f | |||
| a94109fbdd | |||
| 8f9f13f006 | |||
| 8180a792a0 | |||
| 79c780024d | |||
| eb1e7e6827 | |||
| 55d315d8b3 | |||
| 2c656dec36 | |||
| 24061a4a50 | |||
| 9df894d3e4 | |||
| 51fe3a686c | |||
| ec470da92a | |||
| 5dd239c77c | |||
| a0b39f5917 | |||
| bee3c14f63 | |||
| 35b31d6505 | |||
| 7812b76afa | |||
| 18e88a5f4d | |||
| 55c5f7700c | |||
| 179f03d057 | |||
| 20aeb0c32f | |||
| 2f64085db6 | |||
| 90bb880dc8 | |||
| eaa9ad2646 | |||
| 464e40b8fd | |||
| 2de259e20a | |||
| 7e4b054042 | |||
| 3713c8e4bf | |||
| d64cb3cc75 | |||
| 398480e723 | |||
| a8ca305671 | |||
| aa15caa298 | |||
| 5da9a31eda | |||
| 47dee3e0bd | |||
| e046181600 | |||
| ac2d19de68 | |||
| 41a0eb8549 | |||
| 6fb2c089d9 | |||
| 954ae79c5c | |||
| c60158c167 | |||
| 250aa613ad | |||
| f658eab4d5 | |||
| 39fae97c62 | |||
| 43dd680a78 | |||
| 599247f10a | |||
| 1d84f21fe4 | |||
| 51f3eda2a8 | |||
| 812fe73092 | |||
| 52caaa7b47 | |||
| cf130ec054 | |||
| 348d39f566 | |||
| 614729cc94 | |||
| 549b9864e0 | |||
| 72c82b787c | |||
| 40f2a424ac | |||
| a3380922a2 | |||
| e960e28f6d | |||
| 6de1c8cffb | |||
| 92286944fb |
@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
|
||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
LambdaBodyIndentation: Signature
|
||||
MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
|
||||
MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
|
||||
MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
|
||||
MaxEmptyLinesToKeep: 2
|
||||
NamespaceIndentation: None
|
||||
ObjCBinPackProtocolList: Auto
|
||||
|
||||
@@ -5,6 +5,9 @@ cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain targ
|
||||
if (POLICY CMP0053)
|
||||
cmake_policy(SET CMP0053 NEW) # simpler variable expansion and escape sequence evaluation rules
|
||||
endif()
|
||||
if (POLICY CMP0177)
|
||||
cmake_policy(SET CMP0177 OLD)
|
||||
endif()
|
||||
project(shstk)
|
||||
set(CMAKE_MODULE_PATH
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
|
||||
31
Jenkinsfile
vendored
31
Jenkinsfile
vendored
@@ -1,31 +1,44 @@
|
||||
@Library('SHS.Platforms') _
|
||||
def build_docker(dist, release_dir, is_testing) {
|
||||
def image_name = "${dist.docker_image}-shstk"
|
||||
def build_docker(dist, release_dir, is_testing, is_debug) {
|
||||
def image_from = "${dist.docker.image_basename}"
|
||||
def image_name = "${dist.docker.image_basename}-shstk"
|
||||
if (is_testing) {
|
||||
image_name += "-test"
|
||||
}
|
||||
if (is_debug) {
|
||||
image_from += "-debug"
|
||||
image_name += "-debug"
|
||||
}
|
||||
|
||||
echo "Build image ${image_name}"
|
||||
def args = ""
|
||||
for (arg in dist.docker_build_options) {
|
||||
for (arg in dist.docker.build_options) {
|
||||
args += " --build-arg ${arg.key}=\"${arg.value}\""
|
||||
}
|
||||
if (env.DOCKER_PREFIX) {
|
||||
args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
|
||||
}
|
||||
if (env.BRANCH_NAME) {
|
||||
args += " --build-arg BRANCH=${env.BRANCH_NAME}"
|
||||
if ("${env.BRANCH_NAME}" != "shstk") {
|
||||
args += " --build-arg BRANCH=${env.BRANCH_NAME}"
|
||||
}
|
||||
}
|
||||
args += " --build-arg IMAGE_FROM=${dist.docker_image}"
|
||||
args += " --build-arg IMAGE_FROM=${image_from}"
|
||||
args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
|
||||
args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}"
|
||||
def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}")
|
||||
def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker.directory}-shstk --no-cache ${args}")
|
||||
shstk_docker.inside("-v " + release_dir + ":/soft/release") {
|
||||
sh 'cp -vf /soft/shstk/release/* /soft/release/ || true'
|
||||
}
|
||||
return "\n - ${image_name}"
|
||||
}
|
||||
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], copyArtifactPermission('*')]);
|
||||
properties([
|
||||
buildDiscarder(logRotator(numToKeepStr: "2000", artifactNumToKeepStr: "10")),
|
||||
parameters([
|
||||
booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version')
|
||||
]),
|
||||
copyArtifactPermission('*')
|
||||
]);
|
||||
node {
|
||||
stage("Download SRC") {
|
||||
checkout scm
|
||||
@@ -33,6 +46,7 @@ node {
|
||||
|
||||
def currentBranch = "${env.BRANCH_NAME}"
|
||||
def is_testing = currentBranch.toLowerCase().contains("test")
|
||||
def is_debug = Boolean.valueOf(Debug)
|
||||
|
||||
def pl = new org.SHS.Platforms(this)
|
||||
pl.get()
|
||||
@@ -41,6 +55,7 @@ node {
|
||||
if (is_testing) {
|
||||
local_release_dir += '-test'
|
||||
}
|
||||
|
||||
def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir
|
||||
echo "Release to ${rel_dir}"
|
||||
sh "rm -rvf ${rel_dir}"
|
||||
@@ -48,7 +63,7 @@ node {
|
||||
|
||||
def _msg = "Built images:"
|
||||
pl.forEach ({ dist ->
|
||||
_msg += build_docker(dist, rel_dir, is_testing)
|
||||
_msg += build_docker(dist, rel_dir, is_testing, is_debug)
|
||||
},
|
||||
stageSuffix: "-shstk",
|
||||
ondemand: true
|
||||
|
||||
2
cd
2
cd
Submodule cd updated: a3e88f792d...4d955bb846
2
cmake
2
cmake
Submodule cmake updated: 7d53e93799...f74a38900f
@@ -1,5 +1,6 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}android
|
||||
ARG IMAGE_FROM
|
||||
FROM ${DOCKER_PREFIX}${IMAGE_FROM}
|
||||
|
||||
ARG BRANCH=release
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
@@ -23,22 +24,22 @@ WORKDIR /soft/shstk_build_anroid
|
||||
ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake
|
||||
|
||||
ENV _CUR_ABI=armeabi-v7a
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
ENV _CUR_ABI=arm64-v8a
|
||||
WORKDIR /soft/shstk_build_android_${_CUR_ABI}
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
ENV _CUR_ABI=x86
|
||||
WORKDIR /soft/shstk_build_android_${_CUR_ABI}
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
ENV _CUR_ABI=x86_64
|
||||
WORKDIR /soft/shstk_build_android_${_CUR_ABI}
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
RUN mkdir -p /soft/shstk/release
|
||||
|
||||
@@ -12,7 +12,7 @@ WORKDIR /soft
|
||||
RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
|
||||
|
||||
WORKDIR /soft/shstk_build_linux
|
||||
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& ldconfig \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
|
||||
@@ -12,7 +12,7 @@ WORKDIR /soft
|
||||
RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
|
||||
|
||||
WORKDIR /soft/shstk_build_linux
|
||||
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& ldconfig \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
|
||||
@@ -18,7 +18,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
@@ -12,7 +12,7 @@ WORKDIR /soft
|
||||
RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
|
||||
|
||||
WORKDIR /soft/shstk_build_linux
|
||||
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& ldconfig \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}osx
|
||||
ARG IMAGE_FROM
|
||||
FROM ${DOCKER_PREFIX}${IMAGE_FROM}
|
||||
|
||||
ARG BRANCH=release
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
@@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_osx
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}pi
|
||||
ARG IMAGE_FROM
|
||||
FROM ${DOCKER_PREFIX}${IMAGE_FROM}
|
||||
|
||||
ARG BRANCH=release
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
@@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_pi
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}windows
|
||||
ARG IMAGE_FROM
|
||||
FROM ${DOCKER_PREFIX}${IMAGE_FROM}
|
||||
|
||||
ARG BRANCH=release
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
@@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_windows
|
||||
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}windows32
|
||||
ARG IMAGE_FROM
|
||||
FROM ${DOCKER_PREFIX}${IMAGE_FROM}
|
||||
|
||||
ARG BRANCH=release
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
@@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_windows32
|
||||
RUN cmake -G Ninja -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/ \
|
||||
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
2
pip
2
pip
Submodule pip updated: 53ec75bf0c...34bc322b9b
2
qad
2
qad
Submodule qad updated: 04b40d367c...681a79a672
Submodule qglengine updated: 5a7158531f...3d53c8a69f
Reference in New Issue
Block a user