diff --git a/.travis.yml b/.travis.yml index a1d1ebe..c10a458 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ env: - 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: diff --git a/ports/ci/appveyor/build.bat b/ports/ci/appveyor/build.bat index 41faf55..a917a60 100644 --- a/ports/ci/appveyor/build.bat +++ b/ports/ci/appveyor/build.bat @@ -1,18 +1,18 @@ -REM Webcamoid, webcam capture application. -REM Copyright (C) 2016 Gonzalo Exequiel Pedone +REM akvirtualcamera, virtual camera for Mac and Windows. +REM Copyright (C) 2021 Gonzalo Exequiel Pedone REM -REM Webcamoid is free software: you can redistribute it and/or modify +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 Webcamoid is distributed in the hope that it will be useful, +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 Webcamoid. If not, see . +REM along with akvirtualcamera. If not, see . REM REM Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/appveyor/deploy.bat b/ports/ci/appveyor/deploy.bat index f4b9339..88b93e5 100644 --- a/ports/ci/appveyor/deploy.bat +++ b/ports/ci/appveyor/deploy.bat @@ -1,18 +1,18 @@ -REM Webcamoid, webcam capture application. -REM Copyright (C) 2017 Gonzalo Exequiel Pedone +REM akvirtualcamera, virtual camera for Mac and Windows. +REM Copyright (C) 2021 Gonzalo Exequiel Pedone REM -REM Webcamoid is free software: you can redistribute it and/or modify +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 Webcamoid is distributed in the hope that it will be useful, +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 Webcamoid. If not, see . +REM along with akvirtualcamera. If not, see . REM REM Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/appveyor/install_deps.bat b/ports/ci/appveyor/install_deps.bat index ba7df51..26ee3c5 100644 --- a/ports/ci/appveyor/install_deps.bat +++ b/ports/ci/appveyor/install_deps.bat @@ -1,18 +1,18 @@ -REM Webcamoid, webcam capture application. -REM Copyright (C) 2017 Gonzalo Exequiel Pedone +REM akvirtualcamera, virtual camera for Mac and Windows. +REM Copyright (C) 2021 Gonzalo Exequiel Pedone REM -REM Webcamoid is free software: you can redistribute it and/or modify +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 Webcamoid is distributed in the hope that it will be useful, +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 Webcamoid. If not, see . +REM along with akvirtualcamera. If not, see . REM REM Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/appveyor/push_artifacts.bat b/ports/ci/appveyor/push_artifacts.bat index 4db8211..cda5078 100644 --- a/ports/ci/appveyor/push_artifacts.bat +++ b/ports/ci/appveyor/push_artifacts.bat @@ -1,18 +1,18 @@ -REM Webcamoid, webcam capture application. -REM Copyright (C) 2019 Gonzalo Exequiel Pedone +REM akvirtualcamera, virtual camera for Mac and Windows. +REM Copyright (C) 2021 Gonzalo Exequiel Pedone REM -REM Webcamoid is free software: you can redistribute it and/or modify +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 Webcamoid is distributed in the hope that it will be useful, +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 Webcamoid. If not, see . +REM along with akvirtualcamera. If not, see . REM REM Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/appveyor/upload.bat b/ports/ci/appveyor/upload.bat index ebb9279..db1237d 100644 --- a/ports/ci/appveyor/upload.bat +++ b/ports/ci/appveyor/upload.bat @@ -1,18 +1,18 @@ -REM Webcamoid, webcam capture application. -REM Copyright (C) 2019 Gonzalo Exequiel Pedone +REM akvirtualcamera, virtual camera for Mac and Windows. +REM Copyright (C) 2021 Gonzalo Exequiel Pedone REM -REM Webcamoid is free software: you can redistribute it and/or modify +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 Webcamoid is distributed in the hope that it will be useful, +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 Webcamoid. If not, see . +REM along with akvirtualcamera. If not, see . REM REM Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/travis/build.sh b/ports/ci/travis/build.sh index d7ce233..81f54ef 100644 --- a/ports/ci/travis/build.sh +++ b/ports/ci/travis/build.sh @@ -1,20 +1,20 @@ #!/bin/bash -# Webcamoid, webcam capture application. -# Copyright (C) 2017 Gonzalo Exequiel Pedone +# akvirtualcamera, virtual camera for Mac and Windows. +# Copyright (C) 2021 Gonzalo Exequiel Pedone # -# Webcamoid is free software: you can redistribute it and/or modify +# 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. # -# Webcamoid is distributed in the hope that it will be useful, +# 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 Webcamoid. If not, see . +# along with akvirtualcamera. If not, see . # # Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/travis/deploy.sh b/ports/ci/travis/deploy.sh index bc01953..6e1d95b 100644 --- a/ports/ci/travis/deploy.sh +++ b/ports/ci/travis/deploy.sh @@ -1,20 +1,20 @@ #!/bin/bash -# Webcamoid, webcam capture application. -# Copyright (C) 2017 Gonzalo Exequiel Pedone +# akvirtualcamera, virtual camera for Mac and Windows. +# Copyright (C) 2021 Gonzalo Exequiel Pedone # -# Webcamoid is free software: you can redistribute it and/or modify +# 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. # -# Webcamoid is distributed in the hope that it will be useful, +# 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 Webcamoid. If not, see . +# along with akvirtualcamera. If not, see . # # Web-Site: http://webcamoid.github.io/ @@ -42,7 +42,7 @@ 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/windows" +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 @@ -84,7 +84,7 @@ elif [ "${TRAVIS_OS_NAME}" = osx ]; then cd .. export INSTALL_PREFIX="${PWD}/webcamoid-data" - export PACKAGES_DIR="${PWD}/webcamoid-packages/mac" + export PACKAGES_DIR="${PWD}/webcamoid-packages" export PYTHONPATH="${PWD}/DeployTools" export BUILD_PATH="${PWD}/build" python3 ./DeployTools/deploy.py \ diff --git a/ports/ci/travis/install_deps.sh b/ports/ci/travis/install_deps.sh index 83adba5..3eb9077 100644 --- a/ports/ci/travis/install_deps.sh +++ b/ports/ci/travis/install_deps.sh @@ -1,20 +1,20 @@ #!/bin/bash -# Webcamoid, webcam capture application. -# Copyright (C) 2017 Gonzalo Exequiel Pedone +# akvirtualcamera, virtual camera for Mac and Windows. +# Copyright (C) 2021 Gonzalo Exequiel Pedone # -# Webcamoid is free software: you can redistribute it and/or modify +# 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. # -# Webcamoid is distributed in the hope that it will be useful, +# 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 Webcamoid. If not, see . +# along with akvirtualcamera. If not, see . # # Web-Site: http://webcamoid.github.io/ diff --git a/ports/ci/travis/upload.sh b/ports/ci/travis/upload.sh index 9b0b1e1..ccbd078 100644 --- a/ports/ci/travis/upload.sh +++ b/ports/ci/travis/upload.sh @@ -1,20 +1,20 @@ #!/bin/bash -# Webcamoid, webcam capture application. -# Copyright (C) 2017 Gonzalo Exequiel Pedone +# akvirtualcamera, virtual camera for Mac and Windows. +# Copyright (C) 2021 Gonzalo Exequiel Pedone # -# Webcamoid is free software: you can redistribute it and/or modify +# 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. # -# Webcamoid is distributed in the hope that it will be useful, +# 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 Webcamoid. If not, see . +# along with akvirtualcamera. If not, see . # # Web-Site: http://webcamoid.github.io/ @@ -24,80 +24,26 @@ else export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -" fi -if [ "${TRAVIS_OS_NAME}" = linux ]; then - BUILD_FOLDER=build-x64 -else - BUILD_FOLDER=build -fi - if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then - if [ -z "$DAILY_BUILD" ]; then - version=$(grep -re '^version[[:space:]]*=[[:space:]]*' ${BUILD_FOLDER}/package_info.conf | awk -F= '{print $2}' | tr -d ' ') - publish=false + # Upload to Github Releases + hub='' + + if [ "${TRAVIS_OS_NAME}" = linux ]; then + hub=hub-linux-amd64-${GITHUB_HUBVER} else - version=daily-$TRAVIS_BRANCH - publish=true + hub=hub-darwin-amd64-${GITHUB_HUBVER} fi - # Upload to Bintray - - curl -fL https://getcli.jfrog.io | sh - - ./jfrog bt config \ - --user=hipersayanx \ - --key="$BT_KEY" \ - --licenses=GPL-3.0-or-later + 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 - packagePath=${f#$path/} - folder=$(dirname "$packagePath") - - ./jfrog bt upload \ - --user=hipersayanx \ - --key="$BT_KEY" \ - --override=true \ - --publish="$publish" \ - "$f" \ - "webcamoid/webcamoid/akvirtualcamera/$version" \ - "$folder/" + hub release edit -m 'Daily Build' -a "$f" daily-build done - - # Upload to Github Releases - upload=false - - if [[ ! -z "$DAILY_BUILD" && "$upload" == true ]]; then - 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}" - - hubTag=$(hub release -df '%T %t%n' | grep 'Daily Build' | awk '{print $1}' | sed 's/.*://') - - if [ -z "$hubTag" ]; then - hub release create -p -m 'Daily Build' daily - hubTag=$(hub release -df '%T %t%n' | grep 'Daily Build' | awk '{print $1}' | sed 's/.*://') - fi - - if [ ! -z "$hubTag" ]; then - path=webcamoid-packages - - for f in $(find $path -type f); do - hubTag=$(hub release -df '%T %t%n' | grep 'Daily Build' | awk '{print $1}' | sed 's/.*://') - hub release edit -m 'Daily Build' -a "$f" "$hubTag" - done - fi - fi fi