diff --git a/ports/ci/windows-msys/deploy.sh b/ports/ci/windows-msys/deploy.sh index 0fbf4e6..531a29f 100644 --- a/ports/ci/windows-msys/deploy.sh +++ b/ports/ci/windows-msys/deploy.sh @@ -20,20 +20,25 @@ git clone https://github.com/webcamoid/DeployTools.git -export PATH="/c/Program Files (x86)/NSIS:${PATH}" +export PATH=/mingw64/bin:${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 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/* -mkdir -p "${PACKAGES_DIR}" +# mkdir -p "${PACKAGES_DIR}" +# python3 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_W}" \ - -c "${BUILD_PATH_W}/package_info.conf" \ - -o "${PACKAGES_DIR_W}" + -d "${INSTALL_PREFIX}" \ + -c "${BUILD_PATH}/package_info.conf" \ + -o "${PACKAGES_DIR}"