From f91f03e2e960f2353145cbb66906d8866c16a054 Mon Sep 17 00:00:00 2001 From: Linus Yang Date: Wed, 14 Mar 2018 10:55:27 +0800 Subject: [PATCH] MinGW: update libcork and Docker script --- docker/mingw/Dockerfile | 1 + docker/mingw/build.sh | 4 ++-- libcork | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/mingw/Dockerfile b/docker/mingw/Dockerfile index 050fb847..2c2b1da0 100644 --- a/docker/mingw/Dockerfile +++ b/docker/mingw/Dockerfile @@ -38,5 +38,6 @@ RUN /bin/bash -c "source /deps.sh && dk_deps" ADD build.sh / ARG REBUILD=0 +ARG PLUGIN=true RUN /bin/bash -c "source /build.sh && dk_build && dk_package" diff --git a/docker/mingw/build.sh b/docker/mingw/build.sh index ed5beed0..04a0ac30 100644 --- a/docker/mingw/build.sh +++ b/docker/mingw/build.sh @@ -85,8 +85,8 @@ dk_package() { cp ${DIST}/x86_64/bin/ss-${bin}.exe ss-${bin}-x64.exe done for bin in local server; do - cp ${DIST}/i686/bin/obfs-${bin}.exe obfs-${bin}-x86.exe - cp ${DIST}/x86_64/bin/obfs-${bin}.exe obfs-${bin}-x64.exe + cp ${DIST}/i686/bin/obfs-${bin}.exe obfs-${bin}-x86.exe || true + cp ${DIST}/x86_64/bin/obfs-${bin}.exe obfs-${bin}-x64.exe || true done pushd "$SRC/proj" GIT_REV="$(git rev-parse --short HEAD)" diff --git a/libcork b/libcork index d447acd7..c9b3ea96 160000 --- a/libcork +++ b/libcork @@ -1 +1 @@ -Subproject commit d447acd7d1c3615759db01287205434fec90a2b4 +Subproject commit c9b3ea9638b3adcbc07ee229fd630f439cdecae8