From e84a8ac34934e0f1e8891acdf7ed949704f80477 Mon Sep 17 00:00:00 2001 From: Gonzalo Exequiel Pedone Date: Tue, 3 Aug 2021 16:29:20 -0300 Subject: [PATCH] Improved CI build scripts 4. --- ports/ci/windows-msys/deploy.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/ci/windows-msys/deploy.sh b/ports/ci/windows-msys/deploy.sh index d665260..9b375f6 100644 --- a/ports/ci/windows-msys/deploy.sh +++ b/ports/ci/windows-msys/deploy.sh @@ -20,19 +20,19 @@ git clone https://github.com/webcamoid/DeployTools.git -export PATH="/c/Program Files (x86)/NSIS:${PATH}" +# export PATH="/c/Program Files (x86)/NSIS:${PATH}" export INSTALL_PREFIX="${PWD}/package-data-${COMPILER}" -export INSTALL_PREFIX_W=$(cygpath -w "${INSTALL_PREFIX}") +# export INSTALL_PREFIX_W=$(cygpath -w "${INSTALL_PREFIX}") export PACKAGES_DIR="${PWD}/packages/windows-${COMPILER}" -export PACKAGES_DIR_W=$(cygpath -w "${PACKAGES_DIR}") -export PYTHONPATH="${PWD}/DeployTools" +# export PACKAGES_DIR_W=$(cygpath -w "${PACKAGES_DIR}") export BUILD_PATH="${PWD}/build-${COMPILER}-x64" -export BUILD_PATH_W=$(cygpath -w "${BUILD_PATH}") +# export BUILD_PATH_W=$(cygpath -w "${BUILD_PATH}") +export PYTHONPATH="${PWD}/DeployTools" /c/msys64/mingw32/bin/strip "${INSTALL_PREFIX}"/x86/* /c/msys64/mingw64/bin/strip "${INSTALL_PREFIX}"/x64/* -python DeployTools/deploy.py \ - -d "${INSTALL_PREFIX_W}" \ - -c "${BUILD_PATH_W}/package_info.conf" \ - -o "${PACKAGES_DIR_W}" +python3 DeployTools/deploy.py \ + -d "${INSTALL_PREFIX}" \ + -c "${BUILD_PATH}/package_info.conf" \ + -o "${PACKAGES_DIR}"