diff --git a/package_info.conf.in b/package_info.conf.in index 095565a..b94061d 100644 --- a/package_info.conf.in +++ b/package_info.conf.in @@ -32,4 +32,3 @@ license = COPYING requiresAdminRights = true multiUserInstall = false script = ports/deploy/installscript.nsi -verbose = true diff --git a/ports/ci/windows-msys/deploy.sh b/ports/ci/windows-msys/deploy.sh index d9c5132..5350752 100644 --- a/ports/ci/windows-msys/deploy.sh +++ b/ports/ci/windows-msys/deploy.sh @@ -21,31 +21,19 @@ git clone https://github.com/webcamoid/DeployTools.git export PATH="/c/Program Files (x86)/NSIS:/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}" -cat << EOF > package_info_fix_srcdir.conf -[Package] -sourcesDir = ${PWD} -EOF - -# 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}" \ - -c "${BUILD_PATH}/package_info.conf" \ - -c "${PWD}/package_info_fix_srcdir.conf" \ - -o "${PACKAGES_DIR}" + -d "${INSTALL_PREFIX_W}" \ + -c "${BUILD_PATH_W}/package_info.conf" \ + -o "${PACKAGES_DIR_W}"