86 Commits
test ... master

Author SHA1 Message Date
6d075e7cd6 qad 2025-11-29 14:07:36 +03:00
a26c2b87f3 pip 2025-10-22 15:24:25 +03:00
6cf9410e2f pip 2025-10-17 11:30:50 +03:00
9db977f7d5 pip 2025-10-16 11:48:04 +03:00
2b61d631da pip 2025-10-10 19:47:35 +03:00
d714fbff19 pip 2025-10-08 21:15:39 +03:00
3288d32411 pip, qad 2025-10-08 17:00:22 +03:00
676d57a7d8 pip 2025-09-29 18:48:30 +03:00
836c4b956d pip 2025-09-27 15:35:31 +03:00
10e9c1b140 pip 2025-09-23 21:17:06 +03:00
9bb63cdaf3 pip 2025-09-22 22:35:07 +03:00
736972b8e4 pip 2025-09-22 20:59:07 +03:00
7b03919deb pip 2025-09-22 16:26:19 +03:00
00fe1dfa03 .clang-format 2025-09-21 21:08:41 +03:00
1a3945f436 pip 2025-09-21 21:06:08 +03:00
bea339e3f5 pip, qad 2025-09-19 17:40:08 +03:00
f2e2c77552 pip 2025-09-18 20:20:12 +03:00
29736b3b2a pip 2025-09-15 21:26:36 +03:00
32d834882c pip 2025-09-10 16:09:11 +03:00
a2c377f784 pip
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2025-09-05 22:09:40 +03:00
aee673d02e pip 2025-09-05 22:07:25 +03:00
0653392576 pip 2025-08-30 17:12:51 +03:00
d373e3b539 pip 2025-08-15 18:54:30 +03:00
f42df80891 pip 2025-08-14 17:34:54 +03:00
82e1ec849f pip 2025-08-14 10:25:26 +03:00
d2903884de pip 2025-08-13 18:50:07 +03:00
2ef3c2cb61 pip 2025-07-31 20:56:55 +03:00
c04d8b138f pip 2025-07-31 20:56:04 +03:00
a94109fbdd pip 2025-07-30 20:58:05 +03:00
8f9f13f006 cmake 2025-07-17 16:17:02 +03:00
8180a792a0 Merge branch 'master' of https://git.shstk.ru/SHS/shstk
# Conflicts:
#	pip
2025-07-17 11:22:14 +03:00
79c780024d cmake, pip, qad 2025-07-17 11:18:30 +03:00
eb1e7e6827 pip 2025-06-26 17:45:13 +03:00
55d315d8b3 qcodeedit fix incorrect completer position 2025-06-26 17:43:51 +03:00
2c656dec36 qad 2025-06-10 00:02:56 +03:00
24061a4a50 qad 2025-06-09 23:42:08 +03:00
9df894d3e4 pip, qad 2025-06-07 11:12:55 +03:00
51fe3a686c pip 2025-05-18 18:53:41 +03:00
ec470da92a pip 2025-05-14 19:46:53 +03:00
5dd239c77c pip 2025-04-30 15:07:34 +03:00
a0b39f5917 new cmake, pip 2025-04-29 21:51:36 +03:00
bee3c14f63 pip 2025-04-03 16:00:49 +03:00
35b31d6505 qad 2025-03-20 18:48:26 +03:00
7812b76afa qad 2025-03-19 22:04:03 +03:00
18e88a5f4d qad 2025-03-18 16:24:13 +03:00
55c5f7700c qad 2025-03-18 15:17:24 +03:00
179f03d057 qad 2025-03-18 12:16:22 +03:00
20aeb0c32f pip 2025-03-06 16:26:49 +03:00
2f64085db6 pip 2025-03-04 20:20:17 +03:00
90bb880dc8 qad 2025-03-04 19:59:44 +03:00
eaa9ad2646 pip 2025-02-27 21:26:40 +03:00
464e40b8fd pip 2025-02-06 11:13:54 +03:00
2de259e20a qad 2025-01-29 11:53:52 +03:00
7e4b054042 pip 2025-01-17 11:49:35 +03:00
3713c8e4bf pip 2025-01-15 18:38:58 +03:00
d64cb3cc75 pip 2025-01-15 18:25:40 +03:00
398480e723 pip 2025-01-15 17:59:12 +03:00
a8ca305671 pip 2025-01-12 13:11:08 +03:00
aa15caa298 pip 2025-01-09 17:36:48 +03:00
5da9a31eda cmake, pip, qad 2025-01-08 17:37:11 +03:00
47dee3e0bd pip 2024-12-29 11:48:34 +03:00
e046181600 pip 2024-12-26 16:19:41 +03:00
ac2d19de68 pip 2024-12-26 16:18:20 +03:00
41a0eb8549 pip 2024-12-26 16:16:09 +03:00
6fb2c089d9 pip 2024-12-26 16:12:09 +03:00
954ae79c5c pip 2024-12-26 16:02:03 +03:00
c60158c167 pip 2024-12-25 19:38:05 +03:00
250aa613ad pip 2024-12-25 19:34:57 +03:00
f658eab4d5 pip 2024-12-25 19:30:25 +03:00
39fae97c62 new platforms 2024-12-25 13:00:41 +03:00
43dd680a78 cmake 2024-12-19 21:23:06 +03:00
599247f10a j 2024-12-19 15:01:27 +03:00
1d84f21fe4 tmp 2024-12-19 14:58:45 +03:00
51f3eda2a8 pip 2024-12-03 15:41:43 +03:00
812fe73092 fix dockers 2024-12-03 13:32:24 +03:00
52caaa7b47 rrr 2024-12-03 11:34:28 +03:00
cf130ec054 another try 2024-12-03 11:33:43 +03:00
348d39f566 try to work 2024-12-03 11:31:08 +03:00
614729cc94 fix 2024-12-03 11:28:44 +03:00
549b9864e0 test debug builds 2024-12-03 11:26:14 +03:00
72c82b787c pip, Jenkinsfile 2024-11-28 13:36:11 +03:00
40f2a424ac Jenkinsfile 2024-11-28 12:44:29 +03:00
a3380922a2 pip, cd
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
2024-11-28 12:37:18 +03:00
e960e28f6d pip 2024-11-25 16:02:46 +03:00
6de1c8cffb pip 2024-11-25 15:53:20 +03:00
92286944fb pip 2024-11-25 15:00:50 +03:00
17 changed files with 54 additions and 31 deletions

View File

@@ -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

View File

@@ -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}"

29
Jenkinsfile vendored
View File

@@ -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) {
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

Submodule cd updated: a3e88f792d...4d955bb846

2
cmake

Submodule cmake updated: 7d53e93799...f74a38900f

View File

@@ -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

View File

@@ -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} \

View File

@@ -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} \

View File

@@ -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 *

View File

@@ -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} \

View File

@@ -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 *

View File

@@ -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 *

View File

@@ -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 *

View File

@@ -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

Submodule pip updated: 53ec75bf0c...34bc322b9b

2
qad

Submodule qad updated: 04b40d367c...681a79a672