diff --git a/build.sh.in b/build.sh.in index fed48f8b..8dfc7c39 100755 --- a/build.sh.in +++ b/build.sh.in @@ -1,22 +1,5 @@ #!/bin/bash -#--------------------------------------------------------------- -# README -# -# pleas copy build.sh.in to build.sh and change the following -# two lines to fit your env. -# -# Recommend to download miniconda from -# https://conda.io/miniconda.html -# and install it, root priviledge is not necessary. -#--------------------------------------------------------------- -PATH_PYTHON_LINUX=/path/of/your/miniconda/installation -PATH_PYTHON_MACOS=/path/of/your/miniconda/installation - -################################################################ -# DO NOT TOUCH FOLLOWING CODE -################################################################ - PATH_ROOT=$(cd "$(dirname "$0")"; pwd) function on_error() @@ -31,33 +14,27 @@ function on_error() exit 1 } -function check_python +function build_linux { + PYEXEC=${PATH_ROOT}/external/linux/release/bin/python3.7 + PYSTATIC=${PATH_ROOT}/external/linux/release/lib/libpython3.7m.a + if [ ! -f "${PYSTATIC}" ]; then - on_error "python not found." - fi -} + echo "python static not found, now build it..." + "${PATH_ROOT}/build/build-py-static.sh" -function build_linux -{ - PATH_PYTHON=${PATH_PYTHON_LINUX} - PYEXEC=${PATH_PYTHON}/bin/python3.7 - PYSTATIC=${PATH_PYTHON}/lib/libpython3.7m.a + if [ ! -f "${PYSTATIC}" ]; then + on_error "can not build python static." + fi + fi - check_python ${PYEXEC} -B "${PATH_ROOT}/build/build.py" $@ } function build_macos { - PATH_PYTHON=${PATH_PYTHON_LINUX} - PYEXEC=${PATH_PYTHON}/bin/python3.7 - PYSTATIC=${PATH_PYTHON}/lib/libpython3.7m.a - - check_python - - ${PYEXEC} -B "${PATH_ROOT}/build/build.py" $@ + python3 -B "${PATH_ROOT}/build/build.py" $@ } SYSTEM=`uname -s` diff --git a/build/builder/build-external.py b/build/builder/build-external.py index 2f407c91..efb4b1ef 100644 --- a/build/builder/build-external.py +++ b/build/builder/build-external.py @@ -162,7 +162,7 @@ def _build_openssl(self, file_name): break if not need_build: - cc.n('build openssl static library from source code... ', end='') + cc.n('build openssl static library from source code... ', end='') cc.w('already exists, skip.') return cc.v('') diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi index cb017b64..a4cb5cf7 100644 Binary files a/dist/client/windows/assist/installer.nsi and b/dist/client/windows/assist/installer.nsi differ