SHS/shstk
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pip #307

Merged
peri4 merged 2 commits from master into release 2026-05-08 19:14:59 +03:00
Conversation 0 Commits 2 Files Changed 4
+2 -27
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit caa0f59332 - Show all commits
docker/windows-shstk/Dockerfile
+2 -2
View File
@@ -16,8 +16,8 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
&& rm -rf * \
&& ldconfig
WORKDIR /soft/shstk_build_windows
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/ \
WORKDIR /soft/shstk_build_windows${WIN_32_OR_NULL}
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows${WIN_32_OR_NULL} -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows${WIN_32_OR_NULL}.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf *
docker/windows32-shstk/Dockerfile
-25
View File
@@ -1,25 +0,0 @@
ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM
FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG BRANCH=release
ARG LIBS_BUILD_NUMBER=9999
ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft
RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/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_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 *
WORKDIR /soft/src