Improved CI build scripts 11.

This commit is contained in:
Gonzalo Exequiel Pedone 2021-08-03 20:28:12 -03:00
parent f44d3dc9f9
commit 4910b07139
No known key found for this signature in database
GPG key ID: B8B09E63E9B85BAF
2 changed files with 7 additions and 20 deletions

View file

@ -32,4 +32,3 @@ license = COPYING
requiresAdminRights = true requiresAdminRights = true
multiUserInstall = false multiUserInstall = false
script = ports/deploy/installscript.nsi script = ports/deploy/installscript.nsi
verbose = true

View file

@ -21,31 +21,19 @@
git clone https://github.com/webcamoid/DeployTools.git 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:/mingw64/bin:${PATH}"
# export PATH="/c/Program Files (x86)/NSIS:${PATH}"
export INSTALL_PREFIX="${PWD}/package-data-${COMPILER}" 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="${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="${PWD}/build-${COMPILER}-x64"
# export BUILD_PATH_W=$(cygpath -w "${BUILD_PATH}") export BUILD_PATH_W=$(cygpath -w "${BUILD_PATH}")
export PYTHONPATH="${PWD}/DeployTools" export PYTHONPATH="${PWD}/DeployTools"
/c/msys64/mingw32/bin/strip "${INSTALL_PREFIX}"/x86/* /c/msys64/mingw32/bin/strip "${INSTALL_PREFIX}"/x86/*
/c/msys64/mingw64/bin/strip "${INSTALL_PREFIX}"/x64/* /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 \ python3 DeployTools/deploy.py \
-d "${INSTALL_PREFIX}" \ -d "${INSTALL_PREFIX_W}" \
-c "${BUILD_PATH}/package_info.conf" \ -c "${BUILD_PATH_W}/package_info.conf" \
-c "${PWD}/package_info_fix_srcdir.conf" \ -o "${PACKAGES_DIR_W}"
-o "${PACKAGES_DIR}"