diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-02-05 21:38:58 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-02-09 20:51:39 +0000 |
commit | 6cd4fcdec4e6671e63e8c7cba2ab4c6d594b13fd (patch) | |
tree | 09485be8361d503f1acdee57055535a6b3331d17 /other/docker/windows | |
parent | 05912fd65c52f97a600383be11cd741ae32d61bf (diff) |
Remove libcheck from the dependencies.
We're not gaining much from this library, and it's a burden, especially
for windows development.
Diffstat (limited to 'other/docker/windows')
-rw-r--r-- | other/docker/windows/Dockerfile | 1 | ||||
-rw-r--r-- | other/docker/windows/build_dependencies.sh | 12 | ||||
-rw-r--r-- | other/docker/windows/build_toxcore.sh | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/other/docker/windows/Dockerfile b/other/docker/windows/Dockerfile index 176c3937..07903239 100644 --- a/other/docker/windows/Dockerfile +++ b/other/docker/windows/Dockerfile | |||
@@ -4,7 +4,6 @@ FROM debian:stretch-slim | |||
4 | ARG VERSION_SODIUM=1.0.16 | 4 | ARG VERSION_SODIUM=1.0.16 |
5 | ARG VERSION_OPUS=v1.2.1 | 5 | ARG VERSION_OPUS=v1.2.1 |
6 | ARG VERSION_VPX=v1.6.1 | 6 | ARG VERSION_VPX=v1.6.1 |
7 | ARG VERSION_CHECK=0.12.0 | ||
8 | 7 | ||
9 | ARG SUPPORT_TEST=false | 8 | ARG SUPPORT_TEST=false |
10 | ARG SUPPORT_ARCH_i686=true | 9 | ARG SUPPORT_ARCH_i686=true |
diff --git a/other/docker/windows/build_dependencies.sh b/other/docker/windows/build_dependencies.sh index f3d4b603..43c6c3e1 100644 --- a/other/docker/windows/build_dependencies.sh +++ b/other/docker/windows/build_dependencies.sh | |||
@@ -59,18 +59,6 @@ build() | |||
59 | make install | 59 | make install |
60 | cd .. | 60 | cd .. |
61 | 61 | ||
62 | if [ "${SUPPORT_TEST}" = "true" ]; then | ||
63 | echo | ||
64 | echo "=== Building Check ${VERSION_CHECK} ${ARCH} ===" | ||
65 | git clone --depth=1 --branch="${VERSION_CHECK}" https://github.com/libcheck/check | ||
66 | cd check | ||
67 | autoreconf --install | ||
68 | ./configure --host="${WINDOWS_TOOLCHAIN}" --prefix="${EXTRA_PREFIX_DIR}" | ||
69 | make | ||
70 | make install | ||
71 | cd .. | ||
72 | fi | ||
73 | |||
74 | rm -rf /tmp/* | 62 | rm -rf /tmp/* |
75 | } | 63 | } |
76 | 64 | ||
diff --git a/other/docker/windows/build_toxcore.sh b/other/docker/windows/build_toxcore.sh index 0f4c2731..a3830455 100644 --- a/other/docker/windows/build_toxcore.sh +++ b/other/docker/windows/build_toxcore.sh | |||
@@ -17,7 +17,7 @@ build() | |||
17 | # toxcore dependencies that we will copy to the user for static build of toxcore (e.g. vpx, opus, sodium) | 17 | # toxcore dependencies that we will copy to the user for static build of toxcore (e.g. vpx, opus, sodium) |
18 | DEP_PREFIX_DIR="/root/prefix/${ARCH}" | 18 | DEP_PREFIX_DIR="/root/prefix/${ARCH}" |
19 | 19 | ||
20 | # toxcore dependencies that user doesn't need in build result (e.g. libcheck used for testing toxcore) | 20 | # toxcore dependencies that user doesn't need in build result |
21 | EXTRA_DEP_PREFIX_DIR="/root/extra-prefix/${ARCH}" | 21 | EXTRA_DEP_PREFIX_DIR="/root/extra-prefix/${ARCH}" |
22 | mkdir -p "${EXTRA_DEP_PREFIX_DIR}" | 22 | mkdir -p "${EXTRA_DEP_PREFIX_DIR}" |
23 | 23 | ||
@@ -73,7 +73,7 @@ build() | |||
73 | 73 | ||
74 | winecfg | 74 | winecfg |
75 | export CTEST_OUTPUT_ON_FAILURE=1 | 75 | export CTEST_OUTPUT_ON_FAILURE=1 |
76 | # add libgcc_s_sjlj-1.dll libwinpthread-1.dll libcheck-0.dll into PATH env var of wine | 76 | # add libgcc_s_sjlj-1.dll libwinpthread-1.dll into PATH env var of wine |
77 | export WINEPATH=`cd /usr/lib/gcc/${WINDOWS_TOOLCHAIN}/*posix/ ; winepath -w $(pwd)`\;`winepath -w /usr/${WINDOWS_TOOLCHAIN}/lib/`\;`winepath -w ${EXTRA_DEP_PREFIX_DIR}/bin` | 77 | export WINEPATH=`cd /usr/lib/gcc/${WINDOWS_TOOLCHAIN}/*posix/ ; winepath -w $(pwd)`\;`winepath -w /usr/${WINDOWS_TOOLCHAIN}/lib/`\;`winepath -w ${EXTRA_DEP_PREFIX_DIR}/bin` |
78 | 78 | ||
79 | if [ "${ALLOW_TEST_FAILURE}" = "true" ]; then | 79 | if [ "${ALLOW_TEST_FAILURE}" = "true" ]; then |