mirrors/akvirtualcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the new deploy scripts.

Browse source
This commit is contained in:
Gonzalo Exequiel Pedone 2021-03-20 16:13:44 -03:00
parent e408aad47c
commit afa08311c8
No known key found for this signature in database
GPG key ID: B8B09E63E9B85BAF
8 changed files with 47 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ports/ci/appveyor/build.bat
View file

@ -16,7 +16,7 @@ REM along with Webcamoid. If not, see <http://www.gnu.org/licenses/>.
REM
REM Web-Site: http://webcamoid.github.io/
set INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\ports\deploy\temp_priv
set INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\webcamoid-data
echo.
echo Building x64 virtual camera driver
@ -34,7 +34,7 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
..
cmake --build .
cmake --build . --target install
cmake --build . --target install
)
endlocal
@ -47,7 +47,7 @@ if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
..
cmake --build . --config Release
cmake --build . --config Release --target install
cmake --build . --config Release --target install
)
cd ..
@ -68,7 +68,7 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
..
cmake --build .
cmake --build . --target install
cmake --build . --target install
)
endlocal
@ -81,7 +81,7 @@ if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
..
cmake --build . --config Release
cmake --build . --config Release --target install
cmake --build . --config Release --target install
)
cd ..

15
ports/ci/appveyor/deploy.bat
View file

@ -22,11 +22,14 @@ if "%PLATFORM%" == "x86" (
set PYTHON_PATH=C:\%PYTHON_VERSION%-x64
)
cd ports/deploy
git clone https://github.com/webcamoid/DeployTools.git
cd ../..
set INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\webcamoid-data
set PACKAGES_DIR=%APPVEYOR_BUILD_FOLDER%\webcamoid-packages
set PYTHONPATH=%cd%\ports\deploy\DeployTools
git clone https://github.com/webcamoid/DeployTools.git
set PYTHONPATH=%cd%\DeployTools
set BUILD_PATH=%cd%\build-x64
set INSTALL_PATH=%INSTALL_PREFIX%
%PYTHON_PATH%\python.exe ports\deploy\deploy.py
%PYTHON_PATH%\python.exe DeployTools\deploy.py ^
-d "%INSTALL_PREFIX%" ^
-c "%BUILD_PATH%\package_info.conf" ^
-o "%PACKAGES_DIR%"

4
ports/ci/appveyor/push_artifacts.bat
View file

@ -16,8 +16,10 @@ REM along with Webcamoid. If not, see <http://www.gnu.org/licenses/>.
REM
REM Web-Site: http://webcamoid.github.io/
set PACKAGES_DIR=%APPVEYOR_BUILD_FOLDER%\webcamoid-packages
if not "%DAILY_BUILD%" == "" (
for %%f in (ports\deploy\packages_auto\windows\*.exe) do (
for %%f in (%PACKAGES_DIR%\*) do (
appveyor PushArtifact %%f
)
)

4
ports/ci/appveyor/upload.bat
View file

@ -16,13 +16,15 @@ REM along with Webcamoid. If not, see <http://www.gnu.org/licenses/>.
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 (ports\deploy\packages_auto\windows\*.exe) do (
for %%f in (%PACKAGES_DIR%\*) do (
jfrog bt upload ^
--user=hipersayanx ^
--key=%BT_KEY% ^

2
ports/ci/travis/build.sh
View file

@ -19,7 +19,7 @@
# Web-Site: http://webcamoid.github.io/
BUILDSCRIPT=dockerbuild.sh
INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/ports/deploy/temp_priv
INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/webcamoid-data
if [ "${TRAVIS_OS_NAME}" = linux ]; then
sudo mount --bind root.x86_64 root.x86_64

28
ports/ci/travis/deploy.sh
View file

@ -22,9 +22,7 @@ if [ "${TRAVIS_OS_NAME}" = linux ]; then
EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64'
fi
cd ports/deploy
git clone https://github.com/webcamoid/DeployTools.git
cd ../..
DEPLOYSCRIPT=deployscript.sh
@ -38,9 +36,10 @@ if [ "${TRAVIS_OS_NAME}" = linux ]; then
export LC_ALL=C
export HOME=${HOME}
export PATH="${TRAVIS_BUILD_DIR}/.local/bin:\$PATH"
export PYTHONPATH="${TRAVIS_BUILD_DIR}/ports/deploy/DeployTools"
export INSTALL_PREFIX="${TRAVIS_BUILD_DIR}/webcamoid-data"
export PACKAGES_DIR="${TRAVIS_BUILD_DIR}/webcamoid-packages/windows"
export PYTHONPATH="${TRAVIS_BUILD_DIR}/DeployTools"
export BUILD_PATH="${TRAVIS_BUILD_DIR}/build-x64"
export INSTALL_PATH=${TRAVIS_BUILD_DIR}/ports/deploy/temp_priv
export WINEPREFIX=/opt/.wine
cd $TRAVIS_BUILD_DIR
EOF
@ -53,12 +52,15 @@ EOF
cat << EOF >> ${DEPLOYSCRIPT}
cd build-x64
cmake --build . --target install
cmake --build . --target install
cd ..
cd build-x86
cmake --build . --target install
cmake --build . --target install
cd ..
python ports/deploy/deploy.py
python ports/deploy/deploy.py \
-d "\${INSTALL_PREFIX}" \
-c "\${BUILD_PATH}/package_info.conf" \
-o "\${PACKAGES_DIR}"
EOF
chmod +x ${DEPLOYSCRIPT}
sudo cp -vf ${DEPLOYSCRIPT} root.x86_64/$HOME/
@ -68,11 +70,15 @@ EOF
sudo umount root.x86_64
elif [ "${TRAVIS_OS_NAME}" = osx ]; then
cd build
cmake --build . --target install
cmake --build . --target install
cd ..
export PYTHONPATH="${PWD}/ports/deploy/DeployTools"
export INSTALL_PREFIX="${PWD}/webcamoid-data"
export PACKAGES_DIR="${PWD}/webcamoid-packages/mac"
export PYTHONPATH="${PWD}/DeployTools"
export BUILD_PATH="${PWD}/build"
export INSTALL_PATH=${TRAVIS_BUILD_DIR}/ports/deploy/temp_priv
python3 ports/deploy/deploy.py
python3 ports/deploy/deploy.py \
-d "${INSTALL_PREFIX}" \
-c "${BUILD_PATH}/package_info.conf" \
-o "${PACKAGES_DIR}"
fi

62
ports/ci/travis/qt_non_interactive_install.qs
View file

@ -1,62 +0,0 @@
function Controller()
{
installer.autoRejectMessageBoxes();
installer.setMessageBoxAutomaticAnswer("OverwriteTargetDirectory", QMessageBox.Yes);
installer.setMessageBoxAutomaticAnswer("stopProcessesForUpdates", QMessageBox.Ignore);
installer.installationFinished.connect(function() {
gui.clickButton(buttons.NextButton);
})
}
Controller.prototype.WelcomePageCallback = function()
{
gui.clickButton(buttons.NextButton, 10000);
}
Controller.prototype.CredentialsPageCallback = function()
{
gui.clickButton(buttons.NextButton);
}
Controller.prototype.IntroductionPageCallback = function()
{
gui.clickButton(buttons.NextButton);
}
Controller.prototype.TargetDirectoryPageCallback = function()
{
//gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("HomeDir") + "/Qt");
gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("InstallerDirPath") + "/Qt");
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ComponentSelectionPageCallback = function()
{
var widget = gui.currentPageWidget();
widget.deselectAll();
widget.selectComponent("qt.qt5.5141.android");
gui.clickButton(buttons.NextButton);
}
Controller.prototype.LicenseAgreementPageCallback = function()
{
gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ReadyForInstallationPageCallback = function()
{
gui.clickButton(buttons.NextButton);
}
Controller.prototype.FinishedPageCallback = function()
{
var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox)
checkBoxForm.launchQtCreatorCheckBox.checked = false;
gui.clickButton(buttons.FinishButton);
}

15
ports/ci/travis/upload.sh
View file

@ -24,12 +24,15 @@ 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
VER_MAJ=$(grep -re '^VER_MAJ[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
VER_MIN=$(grep -re '^VER_MIN[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
VER_PAT=$(grep -re '^VER_PAT[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
version=$VER_MAJ.$VER_MIN.$VER_PAT
version=$(grep -re '^version[[:space:]]*=[[:space:]]*' ${BUILD_FOLDER}/package_info.conf | awk -F= '{print $2}' | tr -d ' ')
publish=false
else
version=daily-$TRAVIS_BRANCH
@ -45,7 +48,7 @@ if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then
--key=$BT_KEY \
--licenses=GPL-3.0-or-later
path=ports/deploy/packages_auto
path=webcamoid-packages
for f in $(find $path -type f); do
packagePath=${f#$path/}
@ -89,7 +92,7 @@ if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then
fi
if [ ! -z "$hubTag" ]; then
path=ports/deploy/packages_auto
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/.*://')