Compare commits
269 Commits
30fc67c5d2
...
pip_2.39
| Author | SHA1 | Date | |
|---|---|---|---|
| ea57bc5cbd | |||
| d8b843c8e8 | |||
|
|
56bd00ed11 | ||
|
|
2faecd4183 | ||
|
|
e0f3df2217 | ||
| b8804524d4 | |||
|
|
4d9ad58f11 | ||
| 000114b53f | |||
|
|
2877d2e642 | ||
|
|
93f329e26e | ||
| 25a15485a5 | |||
| 10266e2f2c | |||
| 17e292bc58 | |||
| 0ab1cdaddd | |||
| f9385b74c4 | |||
| 178f7ad40e | |||
| df7808a84f | |||
| cf212c8d47 | |||
|
|
7a3fb8218b | ||
|
|
f473119d29 | ||
| 816be49239 | |||
| c9a0a0d69a | |||
| 57aa78c740 | |||
| 5874e5e1ac | |||
| 63d8d365b8 | |||
|
|
df9ed5de85 | ||
| dfa5a1a394 | |||
|
|
6df7387815 | ||
| 349ee2ccb5 | |||
|
|
d04fd3cba4 | ||
| 446a6734d7 | |||
|
|
abf8e1e6c6 | ||
| f7c59ee6ac | |||
|
|
75287cec2e | ||
| 692fedb4b9 | |||
|
|
784d12218b | ||
| 388898531b | |||
|
|
7ab7f64693 | ||
|
|
c2fa3b90ee | ||
|
|
396ca289fb | ||
|
|
8ac7b66ce7 | ||
|
|
7a6761dc7a | ||
|
|
0fd3ec141a | ||
| b0355ba5f5 | |||
| 720ac4c8ed | |||
| aa5758de83 | |||
|
|
24d2caf102 | ||
| 5dbeb7abbc | |||
| 4efd8d2860 | |||
| 225c63b6d9 | |||
| 0ada867018 | |||
| 7ecc327c79 | |||
| 1cdffe24d7 | |||
| 04d56182f8 | |||
|
|
862018e3b0 | ||
|
|
b8c6e41474 | ||
| 1f9b8c239e | |||
| f30965fdaf | |||
| 4165c9fe1c | |||
| 6b09bb70db | |||
|
|
13fa88db43 | ||
| a9d0dd2e63 | |||
| 59daed840f | |||
| ebd5ef3221 | |||
| cfd98b54fd | |||
| b0c80203d0 | |||
| be5f890057 | |||
| 035a2bd825 | |||
| 1625d6c68b | |||
|
|
cd4ede3409 | ||
| 56b1ef1289 | |||
|
|
3b7299747a | ||
| d237969ff2 | |||
| e735fe01a2 | |||
| f66d7bff7d | |||
| 9dba1a0091 | |||
| a313047275 | |||
| efe08dfb27 | |||
| b1b1723013 | |||
| 66a0f201bb | |||
| d1cb019ef0 | |||
| c0dfce7c4b | |||
| 70cc561136 | |||
| afe2c3d53d | |||
| 161eafd887 | |||
| 8c94c2fb6f | |||
| c8dd5b4c50 | |||
| 2b136b2232 | |||
| b8d9c9484f | |||
| 6397a943ae | |||
| 99f51689ac | |||
| eab16008df | |||
| b6656c1cc4 | |||
| 913e8c95f7 | |||
| 2777f44550 | |||
| f081100b58 | |||
| 1078aff0f4 | |||
| 61278804b3 | |||
| d8bd1c6ce1 | |||
| b6737bce40 | |||
| cbfca33349 | |||
| 33c0bd658f | |||
| 621f2bd715 | |||
| d1f7cc2fa7 | |||
| 51c9958c0c | |||
| 58a4166bd1 | |||
| 16bc5b0768 | |||
| a2382385d1 | |||
| f023037aaf | |||
| 871e2d8405 | |||
| 4e05a0b2ce | |||
| 334b457e10 | |||
| ff3559d97b | |||
| 6f3eb61e3d | |||
| 2688a206de | |||
| a98a1770cd | |||
| 1c3db61cc5 | |||
| 25a7c278f0 | |||
| 9868341a48 | |||
| 11bbeeba55 | |||
| f8a662baf6 | |||
| c2ea712ed4 | |||
| 6913dd3fb5 | |||
| 81b4b6efb9 | |||
| 993610a07e | |||
| a0b4ae652c | |||
| 98eea66a49 | |||
| 725dd09336 | |||
| 900f2874ac | |||
| 69d871433f | |||
| 078773b745 | |||
| a8884668a4 | |||
| 076fda99ca | |||
| 5a262a6b44 | |||
| e62fe139c0 | |||
| de0f235903 | |||
| 7c7a6dd173 | |||
| 66463b27ea | |||
| f77062ef25 | |||
| 2311f47898 | |||
| df6577b80f | |||
| de69867e38 | |||
| b74ede80b8 | |||
| 35f61f0c42 | |||
| 9d0e3e5481 | |||
| 1f9243fb8d | |||
| f5e7ba6f45 | |||
| c3af06ff65 | |||
| c3d9c0e2f9 | |||
| 6408ebaf5b | |||
| cae949eacb | |||
| e48fa4fffa | |||
| 2606da735f | |||
| a11bc3d7f8 | |||
| 746745188e | |||
| 8b059bd783 | |||
| b60f133cc9 | |||
| e0bb28560d | |||
| 6a9c328308 | |||
| dab9f3185f | |||
| 066ab32adc | |||
| 67476644dd | |||
| f4034379ac | |||
| 143083c950 | |||
| bc1e4d1fb9 | |||
| 0df27b567b | |||
| 22640d3044 | |||
| a45762afb7 | |||
| 0cbf5dbffa | |||
| 0012f9a37d | |||
| 53a1cb4814 | |||
| 7d4c38ce67 | |||
| 560f99cab3 | |||
| 0b5c390032 | |||
| d8a60dadff | |||
| f3a0a4a3a1 | |||
| 77adf5b64b | |||
| 32e24b963f | |||
| f4bfee1215 | |||
| c099d229ac | |||
| b77f04ba59 | |||
| f56ddc73c8 | |||
| 351d23b11f | |||
| b0fc989388 | |||
| e8a7f02b8f | |||
| b4d4b76b7e | |||
| c6ab0ff16d | |||
| 4198ca574a | |||
| edd3bde8d6 | |||
| 9d78e279a8 | |||
| 1a7b4fff2e | |||
| 706b157c13 | |||
| 49af7e7835 | |||
| fc446fcf98 | |||
| 6e6fc1dcd8 | |||
| b849d7a672 | |||
| 57e1ac6075 | |||
| 4f6ba22d12 | |||
| 9c215fe520 | |||
| 2d1d22f6b8 | |||
| 744c688003 | |||
| 4c3f8b5614 | |||
| 13a8064fa3 | |||
| c784297d3d | |||
| e06d9ee207 | |||
| b6b459e735 | |||
| c65ed7bfd4 | |||
| 88d825456e | |||
| 11dfae988b | |||
| abf01458e2 | |||
| ff4d5cebe0 | |||
| 82ea902972 | |||
| 10e908aea6 | |||
| 56b26f8e3d | |||
| ca75478028 | |||
| 63084955db | |||
| cfc4cb7353 | |||
| 9d1efb1213 | |||
| 0f305f7a41 | |||
| 91c48134cf | |||
| df699d546b | |||
| 0cd5127f06 | |||
| 65d76afee0 | |||
| 1b57cfd0d6 | |||
| 43c1fd8ce2 | |||
| ddea75e2ec | |||
| 5d63d7f1f6 | |||
| fcc9ab371b | |||
| 49ba500dd6 | |||
| 9baa4c53a5 | |||
| d58f61549e | |||
| a66aca0e4e | |||
| bd83c4f022 | |||
| 7e1c6b63e5 | |||
| 0a7da885b1 | |||
| 56658abe96 | |||
| 39d96efee0 | |||
| ca4865b59b | |||
| 1f9c921578 | |||
| 42c05772b1 | |||
| 44dc0a3374 | |||
| 6c9bd1f509 | |||
| 30183e4e72 | |||
| 34b7bedbe6 | |||
| 0b34c9c163 | |||
| 4bfd837b45 | |||
| 88d0b3247c | |||
| a41d654df2 | |||
| 9d330e0fee | |||
| 748341d0da | |||
| a9e8a4d87a | |||
| 07afa116af | |||
| 591f41dc70 | |||
| 0ba225f068 | |||
| f030cc3551 | |||
| 4aaef8b6aa | |||
| 19d1d1f116 | |||
| fb6a81b5f6 | |||
| d63f4ba5ce | |||
| 8991f22ba9 | |||
| 14607fd8d5 | |||
| 2af157d383 | |||
| 901488149c | |||
| 26ddae7596 | |||
| 73114c36ee | |||
| 2d6dacf827 | |||
| 8bcb3f58aa | |||
| 7b2d2f66ae | |||
| d1e49656e9 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,2 +1,4 @@
|
||||
/.svn
|
||||
CMakeLists.txt.user*
|
||||
/release
|
||||
/build
|
||||
|
||||
8
.vscode/settings.json
vendored
Normal file
8
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"*.qs": "javascript",
|
||||
"*.tcc": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"vector": "cpp"
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ set(CMAKE_MODULE_PATH
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/cd_utils/cmake"
|
||||
)
|
||||
set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
set(SHSTKPROJECT 1)
|
||||
|
||||
include(QtWraps)
|
||||
include(SHSTKMacros)
|
||||
@@ -42,7 +43,7 @@ find_package(PIP REQUIRED)
|
||||
|
||||
if (NOT CROSSTOOLS)
|
||||
|
||||
find_qt(Core QUIET)
|
||||
qad_find_qt(Core QUIET)
|
||||
if (SOME_QT_FOUND)
|
||||
|
||||
add_subdirectory(qad)
|
||||
@@ -60,6 +61,6 @@ endif()
|
||||
|
||||
if(WIN32 AND SOME_QT_FOUND)
|
||||
foreach(_l ${PIP_MODULES} ${CD_MODULES})
|
||||
qt_install(TARGETS ${_l} RUNTIME DESTINATION QtBin)
|
||||
qad_install(TARGETS ${_l} RUNTIME DESTINATION QtBin)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
79
Jenkinsfile
vendored
79
Jenkinsfile
vendored
@@ -1,62 +1,51 @@
|
||||
def build_docker(name) {
|
||||
def image = "${name}-shstk"
|
||||
echo "Build image ${image}"
|
||||
def build_docker(name, release_dir) {
|
||||
def image_name = "${name}-shstk"
|
||||
echo "Build image ${image_name}"
|
||||
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} ."
|
||||
}
|
||||
return "\n - ${image}"
|
||||
dir ("docker/${image_name}") {
|
||||
sh "docker build ${args} --no-cache -t ${image_name} ."
|
||||
def diargs = "-v " + release_dir + ":/soft/release"
|
||||
docker.image(image_name).inside(diargs) {
|
||||
sh 'cp -vf /soft/shstk/release/* /soft/release/ || true'
|
||||
}
|
||||
}
|
||||
return "\n - ${image_name}"
|
||||
}
|
||||
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 rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release'
|
||||
echo "Release to ${rel_dir}"
|
||||
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}";
|
||||
}
|
||||
sh "mkdir -p ${rel_dir}"
|
||||
sh "rm -rvf ${rel_dir}"
|
||||
sh "mkdir -p ${rel_dir}"
|
||||
def _msg = "Built images:"
|
||||
def platforms = ['debian', 'osx', 'windows', 'android', 'pi', 'ubuntu']
|
||||
def platforms = ['debian', 'debian11', '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}"
|
||||
}
|
||||
pipeline {
|
||||
agent {
|
||||
label 'master'
|
||||
}
|
||||
stages {
|
||||
stage("PIP doc") {
|
||||
steps {
|
||||
checkout scm
|
||||
sh "rm -rf share"
|
||||
sh "rm -vf *.zip"
|
||||
sh "mkdir -p build"
|
||||
sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` ../"
|
||||
sh "cd build && make doc"
|
||||
sh "cd share/doc && zip -r ../../pip_doc.zip pip"
|
||||
sh "cp share/doc/pip/html/pip.qch ./"
|
||||
archiveArtifacts 'pip_doc.zip'
|
||||
archiveArtifacts 'pip.qch'
|
||||
_msg += build_docker("${platforms[i]}", rel_dir)
|
||||
}
|
||||
}
|
||||
}
|
||||
sh "docker system prune -f"
|
||||
archiveArtifacts 'release/*'
|
||||
echo "${_msg}"
|
||||
}
|
||||
|
||||
@@ -74,7 +74,8 @@ Build steps:
|
||||
set SDK_MINGW_DIR=C:\mingw\8_1_x
|
||||
- set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\
|
||||
set SDK_QT5_DIR=C:\qt\qt5150_win
|
||||
- set SDK_CMAKE_DIR=C:\cmake or C:\Program Files\CMake
|
||||
- set path to cmake directory
|
||||
set SDK_CMAKE_DIR=C:\cmake or C:\Program Files\CMake
|
||||
5. Run `make_shstk32.bat` or `make_shstk64.bat`
|
||||
|
||||
Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat`
|
||||
@@ -87,7 +88,9 @@ This repo provide several Dockerfiles, so you can exec `docker build -t windows-
|
||||
and make docker image "windows-shstk" with installed SHS Toolkit for Windows. Similar for other platforms.
|
||||
Dockerfile provides for next platforms:
|
||||
* Debian 10 (debian-shstk)
|
||||
* Debian 11 (debian11-shstk)
|
||||
* Ubuntu 20.04 (ubuntu-shstk)
|
||||
* Windows x32 (windows32-shstk)
|
||||
* Windows x64 (windows-shstk)
|
||||
* MacOS (osx-shstk)
|
||||
* Raspberry Pi Raspbian (pi-shstk)
|
||||
|
||||
2
cd
2
cd
Submodule cd updated: d6734e1954...7a16d76753
2
cmake
2
cmake
Submodule cmake updated: ca8db429db...61699f2283
@@ -13,8 +13,8 @@ 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} \
|
||||
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
@@ -22,22 +22,24 @@ 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 -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/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
ENV _CUR_ABI=arm64-v8a
|
||||
WORKDIR /soft/shstk_build_android_${_CUR_ABI}
|
||||
RUN cmake -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/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
ENV _CUR_ABI=x86
|
||||
WORKDIR /soft/shstk_build_android_${_CUR_ABI}
|
||||
RUN cmake -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/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
ENV _CUR_ABI=x86_64
|
||||
WORKDIR /soft/shstk_build_android_${_CUR_ABI}
|
||||
RUN cmake -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/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
|
||||
|
||||
RUN mkdir -p /soft/shstk/release
|
||||
|
||||
WORKDIR /soft/src
|
||||
|
||||
@@ -9,8 +9,9 @@ WORKDIR /soft
|
||||
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
|
||||
|
||||
WORKDIR /soft/shstk_build_debian
|
||||
RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& make install -j${JOBS_COUNT} \
|
||||
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
|
||||
18
docker/debian11-shstk/Dockerfile
Normal file
18
docker/debian11-shstk/Dockerfile
Normal file
@@ -0,0 +1,18 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}debian11
|
||||
|
||||
ARG LIBS_BUILD_NUMBER=9999
|
||||
ARG JOBS_COUNT=4
|
||||
ENV PATH=/opt/cmake/bin:$PATH
|
||||
|
||||
WORKDIR /soft
|
||||
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
|
||||
|
||||
WORKDIR /soft/shstk_build_debian
|
||||
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/src
|
||||
@@ -9,13 +9,15 @@ 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} \
|
||||
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_osx
|
||||
RUN cmake -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/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
WORKDIR /soft/src
|
||||
|
||||
@@ -9,13 +9,15 @@ 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} \
|
||||
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_pi
|
||||
RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
WORKDIR /soft/src
|
||||
|
||||
@@ -9,8 +9,9 @@ WORKDIR /soft
|
||||
RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
|
||||
|
||||
WORKDIR /soft/shstk_build_ubuntu
|
||||
RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& make install -j${JOBS_COUNT} \
|
||||
RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
|
||||
@@ -9,13 +9,15 @@ 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} \
|
||||
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& ldconfig
|
||||
|
||||
WORKDIR /soft/shstk_build_windows
|
||||
RUN cmake -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/ \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf *
|
||||
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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
WORKDIR /soft/src
|
||||
|
||||
23
docker/windows32-shstk/Dockerfile
Normal file
23
docker/windows32-shstk/Dockerfile
Normal file
@@ -0,0 +1,23 @@
|
||||
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 -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& rm -rf * \
|
||||
&& 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/ \
|
||||
&& cmake --build ./ --target install -j${JOBS_COUNT} \
|
||||
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
|
||||
&& rm -rf *
|
||||
|
||||
WORKDIR /soft/src
|
||||
@@ -5,11 +5,11 @@ if defined SDK_JOBS_COUNT (
|
||||
) else (
|
||||
set JOBS_COUNT=4
|
||||
)
|
||||
set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin
|
||||
set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin
|
||||
if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH%
|
||||
if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH%
|
||||
cd ..\shstk_build_win%ARCH% && ^
|
||||
cmake_mgw -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^
|
||||
cmake -G "MinGW Makefiles" -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^
|
||||
make install -j%JOBS_COUNT% && ^
|
||||
cd ..\shstk && ^
|
||||
pause
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
cd ..
|
||||
mkdir shstk_build_linux
|
||||
cd shstk_build_linux
|
||||
cmake ../shstk
|
||||
cmake -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk
|
||||
make install $@
|
||||
|
||||
2
pip
2
pip
Submodule pip updated: f99cd70921...28ce6e8f3f
2
qad
2
qad
Submodule qad updated: 925437f809...4c0e61fdb6
Submodule qglengine updated: 07d27ff397...37e2b236f5
2
submodules_revert.sh
Normal file
2
submodules_revert.sh
Normal file
@@ -0,0 +1,2 @@
|
||||
git submodule deinit --all -f
|
||||
git submodule update --recursive --init
|
||||
Reference in New Issue
Block a user