From 1f02dae0229e0f27eb6f55c5ad843b9a141f2047 Mon Sep 17 00:00:00 2001 From: Gonzalo Exequiel Pedone Date: Wed, 30 Jun 2021 13:34:05 -0300 Subject: [PATCH] Removed Travis CI. --- .travis.yml | 95 ------------------ PULL_REQUEST_TEMPLATE.md | 2 +- README.md | 13 ++- appveyor.yml | 9 -- ports/ci/appveyor/push_artifacts.bat | 25 ----- ports/ci/appveyor/upload.bat | 37 ------- ports/ci/linux-mingw/upload.sh | 45 --------- ports/ci/mac/build.sh | 1 - ports/ci/mac/deploy.sh | 2 - ports/ci/mac/upload.sh | 45 --------- ports/ci/travis/build.sh | 71 ------------- ports/ci/travis/deploy.sh | 94 ----------------- ports/ci/travis/install_deps.sh | 144 --------------------------- ports/ci/travis/upload.sh | 49 --------- ports/ci/windows-msys/deploy.sh | 2 +- ports/ci/windows-msys/upload.sh | 46 --------- ports/ci/windows-vs/upload.bat | 47 --------- 17 files changed, 13 insertions(+), 714 deletions(-) delete mode 100644 .travis.yml delete mode 100644 ports/ci/appveyor/push_artifacts.bat delete mode 100644 ports/ci/appveyor/upload.bat delete mode 100644 ports/ci/linux-mingw/upload.sh delete mode 100644 ports/ci/mac/upload.sh delete mode 100644 ports/ci/travis/build.sh delete mode 100644 ports/ci/travis/deploy.sh delete mode 100644 ports/ci/travis/install_deps.sh delete mode 100644 ports/ci/travis/upload.sh delete mode 100644 ports/ci/windows-msys/upload.sh delete mode 100644 ports/ci/windows-vs/upload.bat diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c10a458..0000000 --- a/.travis.yml +++ /dev/null @@ -1,95 +0,0 @@ -language: cpp - -cache: - ccache: true - timeout: 1000 - directories: - - keystores - -env: - global: - - QTIFWVER=4.1.0 - - ARCH_ROOT_DATE=2021.05.01 - - ARCH_ROOT_URL=https://mirror.rackspace.com/archlinux - - NSIS_VERSION=3.06.1 - # BT_KEY - - secure: "hHaLRfMKI1iB/NtKRfS3E+kABSbMOycS3dW2wNmNdCpPEmGaeuBfRIiwXlPMMXYIE/47YUKCGN8vraCoW4yEJGaIsU86MpaHsBYdjNFYaTjkElKTo8d2IgS9ur/ve65Fjutd8rDRGYBcvG9FIcMMgN+rNekSy9L4eVoaFuMq5V5AkxSmQu7YMmny3DMR1+eD7E/I4tu6tde16l51mB47fyW1u/FcyJ8mIAPW5hoSvVznNxAPGd5/80NcqykfjNmTFQ2B7YJMEQPwIA/YJMq+SjOqZNyB0Q8XzN1I9HqK2D2C89dZUI6bD+Q9JNGKIyoEpJ5BzKu6oZaVBGIfCCI9Dyq/B6PCm4s5swVWkGFJzL31EKewvzP3YepszEAbiuFMLW2ye6PJat5pSU13RHVKzVS2jXoFQGdPnwU9dtIRXga1csGar3RqJDlCR2Ncz1DGv80r4Z3CFycrftgFNIRLG1cXaaN4GWM8uE38zSp0hhWyiPXay++rhRdyQU4sq2A3dEA8JqxOR1B6ngxqBgN17u1VHK2EUUZ5HHlv856SnZ1lA94J7T0CBrkRxEDLmE6fLR5n0CuHSX5iA4rRfqKmF1FfQi/IaG+EWKbACkmQGIV9+aKB30JqsJvcXLtSGTC7IzonIzIKiBhjJo7AbW45VzzmfBC3MqiNPpEwwTiRKDI=" - # GITHUB_TOKEN - - secure: "Q84BZAbjRsT8oBbgYIsXcHAhDd+u2LvPjLCQNY5hRUVOlOOVleHjHGFR0s6/A9YmrdGaPzaY3wrErOJ+AcolRUY0kzrPPz4bbiaznuy0K+jHtgC7ddnAcbZOdZoWwcBm/9tw1U68NaFg5OdrKQXRtQ3FPXExpRxTf+uIyVgVdowCTv2b9fRFIwLLMwn/Lhx5y9BIPEmNO9iTolIrflxiyH/KBMUnuM9+1bd7TXkHwWKhWEWoQgOE6/D+v7MCNRv7xonQsghS5o7bC8vAbZw9Oi6LGFoxkw+dR/vbCcghQUkmzBCPMQgXnT/cAPt2KHWMfG97mtO5n2HwkD/mcWLa0gud6xLD913FlSe1cgw5BHzVZLELdvHOImuh2r3+3QWDzSARJh+rTw4vy7uhiwdwgN5IU9rFTQ3rIOnnqLm3LLxXbKq2SbX8RopZi32JkTVFn61eDOF735IY4qSkzu5olBYhstPhbUWVeBaSjy5/cz20VTgqlKKVdZINBTAusRhyUYuaM7mE2Czr2FI9XGjzWxGhMvFdHtLove21gtY6WKPVW8pQbvcn/+MVocpHeR2oxKJhWAffD9uv/cRyPcm3I7RufjDofJC92cmWxeiueG4kilELgkByAooV6NA2wmmXgWQHf5hqHhYAMZ2GBQjSAorNCp73ums9oOUvV5wzkRE=" - -matrix: - include: - - os: linux - dist: focal - compiler: gcc - env: - - DAILY_BUILD=1 - - os: linux - dist: focal - compiler: gcc - env: - - RELEASE_BUILD=1 - - os: osx - osx_image: xcode10.2 - compiler: clang - env: - - DAILY_BUILD=1 - - os: osx - osx_image: xcode10.2 - compiler: clang - env: - - RELEASE_BUILD=1 - - os: osx - osx_image: xcode10.3 - compiler: clang - - os: osx - osx_image: xcode11 - compiler: clang - - os: osx - osx_image: xcode11.1 - compiler: clang - - os: osx - osx_image: xcode11.2 - compiler: clang - - os: osx - osx_image: xcode11.3 - compiler: clang - - os: osx - osx_image: xcode11.4 - compiler: clang - - os: osx - osx_image: xcode11.5 - compiler: clang - - os: osx - osx_image: xcode11.6 - compiler: clang - - os: osx - osx_image: xcode12 - compiler: clang - - os: osx - osx_image: xcode12u - compiler: clang - - os: osx - osx_image: xcode12.2 - compiler: clang - -install: - - chmod +x ports/ci/travis/install_deps.sh - - ports/ci/travis/install_deps.sh - -script: - - chmod +x ports/ci/travis/build.sh - - ports/ci/travis/build.sh - -after_success: - - chmod +x ports/ci/travis/deploy.sh - - ports/ci/travis/deploy.sh - - chmod +x ports/ci/travis/upload.sh - - ports/ci/travis/upload.sh - -notifications: - recipients: - - hipersayan.x@gmail.com - email: - on_success: change - on_failure: change diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 16b498d..b6e0683 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ Before contributing, please read [the contributing document](https://github.com/webcamoid/akvirtualcamera/blob/master/CONTRIBUTING.md), and the [coding style and conventions](https://github.com/webcamoid/webcamoid/wiki/Coding-style-and-conventions) guide. Search the [pull request list](https://github.com/webcamoid/akvirtualcamera/pulls) for similar pulls before opening a new one. -Check your code doesn't throw any warning or error message while compiling, and doesn't give any warning in Clang static analyzer. Make sure your code is GCC, Clang, MinGW and MSVC compliant (use AppVeyor and Travis for that). +Check your code doesn't throw any warning or error message while compiling, and doesn't give any warning in Clang static analyzer. Make sure your code is GCC, Clang, MinGW and MSVC compliant (use AppVeyor and Github actions for that). Check your code using GDB, Valgrind and similar tools to remove all possible memory leaks and segfaults. # Pull request diff --git a/README.md b/README.md index 75e7af2..c3cf737 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,21 @@ akvirtualcamera is virtual camera implemented as a DirectShow filter in Windows, Visit the [wiki](https://github.com/webcamoid/akvirtualcamera/wiki) for a comprehensive compile and install instructions. +## Downloads ## + +[![Download](https://img.shields.io/badge/Download-Releases-3f2a7e.svg)](https://github.com/webcamoid/akvirtualcamera/releases) +[![Daily Build](https://img.shields.io/badge/Download-Daily%20Build-3f2a7e.svg)](https://github.com/webcamoid/akvirtualcamera/releases/tag/daily-build) +[![Total Downloads](https://img.shields.io/github/downloads/webcamoid/akvirtualcamera/total.svg?label=Total%20Downloads&color=3f2a7e)](https://tooomm.github.io/github-release-stats/?username=webcamoid&repository=akvirtualcamera) + ## Status -[![Build Status](https://travis-ci.com/webcamoid/akvirtualcamera.svg?branch=master)](https://travis-ci.com/webcamoid/akvirtualcamera) +[![Linux MinGW](https://github.com/webcamoid/akvirtualcamera/actions/workflows/linux-mingw.yml/badge.svg)](https://github.com/webcamoid/akvirtualcamera/actions/workflows/linux-mingw.yml) +[![Mac](https://github.com/webcamoid/akvirtualcamera/actions/workflows/mac.yml/badge.svg)](https://github.com/webcamoid/akvirtualcamera/actions/workflows/mac.yml) +[![Windows MSYS](https://github.com/webcamoid/akvirtualcamera/actions/workflows/windows-msys.yml/badge.svg)](https://github.com/webcamoid/akvirtualcamera/actions/workflows/windows-msys.yml) +[![Windows MSVC](https://github.com/webcamoid/akvirtualcamera/actions/workflows/windows-vs.yml/badge.svg)](https://github.com/webcamoid/akvirtualcamera/actions/workflows/windows-vs.yml) [![Build status](https://ci.appveyor.com/api/projects/status/rwd4of9casmfmmys?svg=true)](https://ci.appveyor.com/project/hipersayanX/akvirtualcamera) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/1cee2645a3604633a506a203fb8c3161)](https://www.codacy.com/gh/webcamoid/akvirtualcamera/dashboard?utm_source=github.com&utm_medium=referral&utm_content=webcamoid/akvirtualcamera&utm_campaign=Badge_Grade) -[![Daily Build](https://api.bintray.com/packages/webcamoid/webcamoid/akvirtualcamera/images/download.svg?version=daily)](https://bintray.com/webcamoid/webcamoid/akvirtualcamera/daily) +[![Project Stats](https://www.openhub.net/p/akvirtualcamera/widgets/project_thin_badge.gif)](https://www.openhub.net/p/akvirtualcamera) ## Reporting Bugs diff --git a/appveyor.yml b/appveyor.yml index 6a6c0a7..5688ba0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,10 +13,6 @@ build: environment: global: PYTHON_VERSION: Python39 - # api key from https://bintray.com/profile/edit - # encrypted in https://ci.appveyor.com/tools/encrypt - BT_KEY: - secure: seneRk4ppI4bquIsdweI8pd8FT0RXUvU2LOUNGSBEA28IhFQijypil2CfC3WtJxa matrix: - CMAKE_GENERATOR: MSYS Makefiles @@ -31,11 +27,6 @@ build_script: after_build: - ports\ci\appveyor\deploy.bat -# - ports\ci\appveyor\push_artifacts.bat -# -#deploy_script: -# - ports\ci\appveyor\upload.bat - notifications: - provider: Email to: diff --git a/ports/ci/appveyor/push_artifacts.bat b/ports/ci/appveyor/push_artifacts.bat deleted file mode 100644 index cda5078..0000000 --- a/ports/ci/appveyor/push_artifacts.bat +++ /dev/null @@ -1,25 +0,0 @@ -REM akvirtualcamera, virtual camera for Mac and Windows. -REM Copyright (C) 2021 Gonzalo Exequiel Pedone -REM -REM akvirtualcamera is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM akvirtualcamera is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with akvirtualcamera. If not, see . -REM -REM Web-Site: http://webcamoid.github.io/ - -set PACKAGES_DIR=%APPVEYOR_BUILD_FOLDER%\webcamoid-packages - -if not "%DAILY_BUILD%" == "" ( - for %%f in (%PACKAGES_DIR%\*) do ( - appveyor PushArtifact %%f - ) -) diff --git a/ports/ci/appveyor/upload.bat b/ports/ci/appveyor/upload.bat deleted file mode 100644 index db1237d..0000000 --- a/ports/ci/appveyor/upload.bat +++ /dev/null @@ -1,37 +0,0 @@ -REM akvirtualcamera, virtual camera for Mac and Windows. -REM Copyright (C) 2021 Gonzalo Exequiel Pedone -REM -REM akvirtualcamera is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM akvirtualcamera is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with akvirtualcamera. If not, see . -REM -REM Web-Site: http://webcamoid.github.io/ - -set PACKAGES_DIR=%APPVEYOR_BUILD_FOLDER%\webcamoid-packages - -if not "%DAILY_BUILD%" == "" ( - jfrog bt config ^ - --user=hipersayanx ^ - --key=%BT_KEY% ^ - --licenses=GPL-3.0-or-later - - for %%f in (%PACKAGES_DIR%\*) do ( - jfrog bt upload ^ - --user=hipersayanx ^ - --key=%BT_KEY% ^ - --override=true ^ - --publish=true ^ - %%f ^ - webcamoid/webcamoid/webcamoid/daily-%APPVEYOR_REPO_BRANCH% ^ - windows/ - ) -) diff --git a/ports/ci/linux-mingw/upload.sh b/ports/ci/linux-mingw/upload.sh deleted file mode 100644 index 3853eaf..0000000 --- a/ports/ci/linux-mingw/upload.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -SOURCES_DIR=${PWD} - -if [ ! -z "${USE_WGET}" ]; then - export DOWNLOAD_CMD="wget -nv -c" -else - export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" -fi - -if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then - # Upload to Github Releases - hub=hub-linux-amd64-${GITHUB_HUBVER} - - cd "${SOURCES_DIR}" - ${DOWNLOAD_CMD} "https://github.com/github/hub/releases/download/v${GITHUB_HUBVER}/${hub}.tgz" || true - tar xzf "${hub}.tgz" - mkdir -p .local - cp -rf "${hub}"/* .local/ - - export PATH="${PWD}/.local/bin:${PATH}" - path=webcamoid-packages - - for f in $(find $path -type f); do - hub release edit -m 'Daily Build' -a "$f" daily-build - done -fi diff --git a/ports/ci/mac/build.sh b/ports/ci/mac/build.sh index 4e99fae..9fab839 100644 --- a/ports/ci/mac/build.sh +++ b/ports/ci/mac/build.sh @@ -18,7 +18,6 @@ # # Web-Site: http://webcamoid.github.io/ -BUILDSCRIPT=dockerbuild.sh SOURCES_DIR=${PWD} INSTALL_PREFIX=${SOURCES_DIR}/webcamoid-data diff --git a/ports/ci/mac/deploy.sh b/ports/ci/mac/deploy.sh index 2414f14..0a49f56 100644 --- a/ports/ci/mac/deploy.sh +++ b/ports/ci/mac/deploy.sh @@ -22,8 +22,6 @@ SOURCES_DIR=${PWD} git clone https://github.com/webcamoid/DeployTools.git -DEPLOYSCRIPT=deployscript.sh - cd build cmake --build . --target install cd .. diff --git a/ports/ci/mac/upload.sh b/ports/ci/mac/upload.sh deleted file mode 100644 index e03e103..0000000 --- a/ports/ci/mac/upload.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -SOURCES_DIR=${PWD} - -if [ ! -z "${USE_WGET}" ]; then - export DOWNLOAD_CMD="wget -nv -c" -else - export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" -fi - -if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then - # Upload to Github Releases - hub=hub-darwin-amd64-${GITHUB_HUBVER} - - cd "${SOURCES_DIR}" - ${DOWNLOAD_CMD} "https://github.com/github/hub/releases/download/v${GITHUB_HUBVER}/${hub}.tgz" || true - tar xzf "${hub}.tgz" - mkdir -p .local - cp -rf "${hub}"/* .local/ - - export PATH="${PWD}/.local/bin:${PATH}" - path=webcamoid-packages - - for f in $(find $path -type f); do - hub release edit -m 'Daily Build' -a "$f" daily-build - done -fi diff --git a/ports/ci/travis/build.sh b/ports/ci/travis/build.sh deleted file mode 100644 index 81f54ef..0000000 --- a/ports/ci/travis/build.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -BUILDSCRIPT=dockerbuild.sh -INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/webcamoid-data - -if [ "${TRAVIS_OS_NAME}" = linux ]; then - sudo mount --bind root.x86_64 root.x86_64 - sudo mount --bind "$HOME" "root.x86_64/$HOME" - cat << EOF > ${BUILDSCRIPT} -#!/bin/sh - -export LC_ALL=C -export HOME=$HOME -cd ${TRAVIS_BUILD_DIR} -echo -echo "Building x64 virtual camera driver" -echo -mkdir build-x64 -cd build-x64 -x86_64-w64-mingw32-cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ - .. -cmake --build . -cd .. -echo -echo "Building x86 virtual camera driver" -echo -mkdir build-x86 -cd build-x86 -i686-w64-mingw32-cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ - .. -cmake --build . -EOF - chmod +x ${BUILDSCRIPT} - sudo cp -vf ${BUILDSCRIPT} "root.x86_64/$HOME/" - - EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64' - ${EXEC} bash "$HOME/${BUILDSCRIPT}" - - sudo umount "root.x86_64/$HOME" - sudo umount root.x86_64 -elif [ "${TRAVIS_OS_NAME}" = osx ]; then - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ - .. - cmake --build . -fi diff --git a/ports/ci/travis/deploy.sh b/ports/ci/travis/deploy.sh deleted file mode 100644 index 6e1d95b..0000000 --- a/ports/ci/travis/deploy.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -if [ "${TRAVIS_OS_NAME}" = linux ]; then - EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64' -fi - -git clone https://github.com/webcamoid/DeployTools.git - -DEPLOYSCRIPT=deployscript.sh - -if [ "${TRAVIS_OS_NAME}" = linux ]; then - sudo mount --bind root.x86_64 root.x86_64 - sudo mount --bind "$HOME" "root.x86_64/$HOME" - - cat << EOF > package_info_strip.conf -[System] -stripCmd = x86_64-w64-mingw32-strip -EOF - - cat << EOF > ${DEPLOYSCRIPT} -#!/bin/sh - -export LC_ALL=C -export HOME=${HOME} -export PATH="${TRAVIS_BUILD_DIR}/.local/bin:\$PATH" -export INSTALL_PREFIX="${TRAVIS_BUILD_DIR}/webcamoid-data" -export PACKAGES_DIR="${TRAVIS_BUILD_DIR}/webcamoid-packages" -export PYTHONPATH="${TRAVIS_BUILD_DIR}/DeployTools" -export BUILD_PATH="${TRAVIS_BUILD_DIR}/build-x64" -export WINEPREFIX=/opt/.wine -cd $TRAVIS_BUILD_DIR -EOF - - if [ ! -z "${DAILY_BUILD}" ]; then - cat << EOF >> ${DEPLOYSCRIPT} -export DAILY_BUILD=1 -EOF - fi - - cat << EOF >> ${DEPLOYSCRIPT} -cd build-x64 -cmake --build . --target install -cd .. -cd build-x86 -cmake --build . --target install -cd .. - -i686-w64-mingw32-strip \${INSTALL_PREFIX}/x86/* -x86_64-w64-mingw32-strip \${INSTALL_PREFIX}/x64/* - -python ./DeployTools/deploy.py \ - -d "\${INSTALL_PREFIX}" \ - -c "\${BUILD_PATH}/package_info.conf" \ - -c "./package_info_strip.conf" \ - -o "\${PACKAGES_DIR}" -EOF - chmod +x ${DEPLOYSCRIPT} - sudo cp -vf ${DEPLOYSCRIPT} "root.x86_64/$HOME/" - - ${EXEC} bash "$HOME/${DEPLOYSCRIPT}" - sudo umount "root.x86_64/$HOME" - sudo umount root.x86_64 -elif [ "${TRAVIS_OS_NAME}" = osx ]; then - cd build - cmake --build . --target install - cd .. - - export INSTALL_PREFIX="${PWD}/webcamoid-data" - export PACKAGES_DIR="${PWD}/webcamoid-packages" - export PYTHONPATH="${PWD}/DeployTools" - export BUILD_PATH="${PWD}/build" - python3 ./DeployTools/deploy.py \ - -d "${INSTALL_PREFIX}" \ - -c "${BUILD_PATH}/package_info.conf" \ - -o "${PACKAGES_DIR}" -fi diff --git a/ports/ci/travis/install_deps.sh b/ports/ci/travis/install_deps.sh deleted file mode 100644 index 3eb9077..0000000 --- a/ports/ci/travis/install_deps.sh +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -#qtIinstallerVerbose=-v - -if [ ! -z "${USE_WGET}" ]; then - export DOWNLOAD_CMD="wget -nv -c" -else - export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" -fi - -if [ "${TRAVIS_OS_NAME}" = linux ]; then - EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64' -fi - -if [ "${TRAVIS_OS_NAME}" = linux ]; then - # Download chroot image - archImage=archlinux-bootstrap-${ARCH_ROOT_DATE}-x86_64.tar.gz - ${DOWNLOAD_CMD} "${ARCH_ROOT_URL}/iso/${ARCH_ROOT_DATE}/$archImage" - sudo tar xzf "$archImage" - - # Configure mirrors - cp -vf root.x86_64/etc/pacman.conf . - cat << EOF >> pacman.conf - -[multilib] -Include = /etc/pacman.d/mirrorlist - -[ownstuff] -Server = https://ftp.f3l.de/~martchus/\$repo/os/\$arch -Server = http://martchus.no-ip.biz/repo/arch/\$repo/os/\$arch -EOF - sed -i 's/Required DatabaseOptional/Never/g' pacman.conf - sed -i 's/#TotalDownload/TotalDownload/g' pacman.conf - sudo cp -vf pacman.conf root.x86_64/etc/pacman.conf - - cp -vf root.x86_64/etc/pacman.d/mirrorlist . - cat << EOF >> mirrorlist - -Server = ${ARCH_ROOT_URL}/\$repo/os/\$arch -EOF - sudo cp -vf mirrorlist root.x86_64/etc/pacman.d/mirrorlist - - # Install packages - sudo mkdir -pv "root.x86_64/$HOME" - sudo mount --bind root.x86_64 root.x86_64 - sudo mount --bind "$HOME" "root.x86_64/$HOME" - - ${EXEC} pacman-key --init - ${EXEC} pacman-key --populate archlinux - ${EXEC} pacman -Syu \ - --noconfirm \ - --ignore linux,linux-api-headers,linux-docs,linux-firmware,linux-headers,pacman - - ${EXEC} pacman --noconfirm --needed -S \ - ccache \ - clang \ - file \ - git \ - make \ - pkgconf \ - python \ - sed \ - xorg-server-xvfb \ - wine \ - mingw-w64-pkg-config \ - mingw-w64-gcc \ - mingw-w64-cmake - - # Install NSIS - - nsis=nsis-${NSIS_VERSION}-setup.exe - ${DOWNLOAD_CMD} "https://sourceforge.net/projects/nsis/files/NSIS%20${NSIS_VERSION:0:1}/${NSIS_VERSION}/${nsis}" - - if [ -e "${nsis}" ]; then - INSTALLSCRIPT=installscript.sh - - cat << EOF > ${INSTALLSCRIPT} -#!/bin/sh - -export LC_ALL=C -export HOME=$HOME -export WINEPREFIX=/opt/.wine -cd $TRAVIS_BUILD_DIR - -wine ./${nsis} /S -EOF - - chmod +x ${INSTALLSCRIPT} - sudo cp -vf ${INSTALLSCRIPT} "root.x86_64/$HOME/" - ${EXEC} bash "$HOME/${INSTALLSCRIPT}" - fi - - # Finish - sudo umount "root.x86_64/$HOME" - sudo umount root.x86_64 -elif [ "${TRAVIS_OS_NAME}" = osx ]; then - brew update - brew upgrade - brew link --overwrite numpy - brew install \ - ccache \ - cmake \ - p7zip \ - pkg-config \ - python - brew link --overwrite python - brew link python - - # Install Qt Installer Framework - qtIFW=QtInstallerFramework-macOS-x86_64-${QTIFWVER}.dmg - ${DOWNLOAD_CMD} "http://download.qt.io/official_releases/qt-installer-framework/${QTIFWVER}/${qtIFW}" || true - - if [ -e "${qtIFW}" ]; then - hdiutil convert "${qtIFW}" -format UDZO -o qtifw - 7z x -oqtifw qtifw.dmg -bb - 7z x -oqtifw qtifw/5.hfsx -bb - installer=qtifw/QtInstallerFramework-macOS-x86_64-${QTIFWVER}/QtInstallerFramework-macOS-x86_64-${QTIFWVER}.app/Contents/MacOS/QtInstallerFramework-macOS-x86_64-${QTIFWVER} - chmod +x "${installer}" - ${installer} \ - --verbose \ - --accept-licenses \ - --accept-messages \ - --confirm-command \ - install - fi -fi diff --git a/ports/ci/travis/upload.sh b/ports/ci/travis/upload.sh deleted file mode 100644 index ccbd078..0000000 --- a/ports/ci/travis/upload.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -if [ ! -z "${USE_WGET}" ]; then - export DOWNLOAD_CMD="wget -nv -c" -else - export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" -fi - -if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then - # Upload to Github Releases - hub='' - - if [ "${TRAVIS_OS_NAME}" = linux ]; then - hub=hub-linux-amd64-${GITHUB_HUBVER} - else - hub=hub-darwin-amd64-${GITHUB_HUBVER} - fi - - cd "${TRAVIS_BUILD_DIR}" - ${DOWNLOAD_CMD} "https://github.com/github/hub/releases/download/v${GITHUB_HUBVER}/${hub}.tgz" || true - tar xzf "${hub}.tgz" - mkdir -p .local - cp -rf "${hub}"/* .local/ - - export PATH="${PWD}/.local/bin:${PATH}" - path=webcamoid-packages - - for f in $(find $path -type f); do - hub release edit -m 'Daily Build' -a "$f" daily-build - done -fi diff --git a/ports/ci/windows-msys/deploy.sh b/ports/ci/windows-msys/deploy.sh index e36e51e..8f3e295 100644 --- a/ports/ci/windows-msys/deploy.sh +++ b/ports/ci/windows-msys/deploy.sh @@ -31,7 +31,7 @@ git clone https://github.com/webcamoid/DeployTools.git export PATH="/c/Program Files (x86)/NSIS:${PATH}" -PYTHONPATH=${SOURCES_DIR}/DeployTools +export PYTHONPATH=${SOURCES_DIR}/DeployTools BUILD_PATH=${SOURCES_DIR}/build-x64 BUILD_PATH_W=$(cygpath -w "${BUILD_PATH}") python DeployTools/deploy.py \ diff --git a/ports/ci/windows-msys/upload.sh b/ports/ci/windows-msys/upload.sh deleted file mode 100644 index 0f5b2af..0000000 --- a/ports/ci/windows-msys/upload.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# akvirtualcamera, virtual camera for Mac and Windows. -# Copyright (C) 2021 Gonzalo Exequiel Pedone -# -# akvirtualcamera is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# akvirtualcamera is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with akvirtualcamera. If not, see . -# -# Web-Site: http://webcamoid.github.io/ - -SOURCES_DIR=${PWD} -PACKAGES_DIR=${SOURCES_DIR}/webcamoid-packages - -if [ ! -z "${USE_WGET}" ]; then - export DOWNLOAD_CMD="wget -nv -c" -else - export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" -fi - -if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then - # Upload to Github Releases - hub=hub-windows-amd64-${GITHUB_HUBVER} - - cd "${SOURCES_DIR}" - ${DOWNLOAD_CMD} "https://github.com/github/hub/releases/download/v${GITHUB_HUBVER}/${hub}.zip" || true - unzip "${hub}.zip" - mkdir -p .local - cp -rf "${hub}"/* .local/ - - export PATH="${PWD}/.local/bin:${PATH}" - path=webcamoid-packages - - for f in $(find $path -type f); do - hub release edit -m 'Daily Build' -a "$f" daily-build - done -fi diff --git a/ports/ci/windows-vs/upload.bat b/ports/ci/windows-vs/upload.bat deleted file mode 100644 index 961bb23..0000000 --- a/ports/ci/windows-vs/upload.bat +++ /dev/null @@ -1,47 +0,0 @@ -REM akvirtualcamera, virtual camera for Mac and Windows. -REM Copyright (C) 2021 Gonzalo Exequiel Pedone -REM -REM akvirtualcamera is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM akvirtualcamera is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with akvirtualcamera. If not, see . -REM -REM Web-Site: http://webcamoid.github.io/ - -set SOURCES_DIR=%cd% -set PACKAGES_DIR=%SOURCES_DIR%\webcamoid-packages - -if not "%USE_WGET%" == "" ( - set DOWNLOAD_CMD="wget -nv -c" -) else ( - set DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" -) - -REM set upload= -REM if not "%DAILY_BUILD%" == "" set upload=true -REM if not "%RELEASE_BUILD%" == "" set upluad=true -REM if "%upload%" == "true" ( -REM REM Upload to Github Releases -REM set hub=hub-windows-amd64-%GITHUB_HUBVER% -REM -REM cd "%SOURCES_DIR%" -REM %DOWNLOAD_CMD% "https://github.com/github/hub/releases/download/v%GITHUB_HUBVER%/%hub%.zip" -REM unzip "%hub%.zip" -REM mkdir .local -REM xcopy "%hub%"\* .local /i /y -REM -REM set PATH=%cd%/.local/bin;%PATH% -REM set path=webcamoid-packages -REM -REM for %%f in (%path%\*) do ( -REM hub release edit -m "Daily Build" -a %%f daily-build -REM ) -REM )