From ee858448c51ffcd5d68be6c99c4c0bbda6169ab9 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Wed, 28 Apr 2021 20:34:46 -0700 Subject: [PATCH] CI: Don't need these anymore --- CI/linux/build-plugin-ubuntu.sh | 9 ------ CI/linux/install-dependencies-ubuntu.sh | 26 ----------------- CI/linux/package-plugin-ubuntu.sh | 24 ---------------- CI/windows/download-obs-deps.cmd | 7 ----- CI/windows/install-qt-win.cmd | 8 ------ CI/windows/package-plugin-windows.cmd | 12 -------- CI/windows/prepare-obs-windows.cmd | 37 ------------------------- CI/windows/prepare-plugin-windows.cmd | 7 ----- 8 files changed, 130 deletions(-) delete mode 100644 CI/linux/build-plugin-ubuntu.sh delete mode 100644 CI/linux/install-dependencies-ubuntu.sh delete mode 100644 CI/linux/package-plugin-ubuntu.sh delete mode 100644 CI/windows/download-obs-deps.cmd delete mode 100644 CI/windows/install-qt-win.cmd delete mode 100644 CI/windows/package-plugin-windows.cmd delete mode 100644 CI/windows/prepare-obs-windows.cmd delete mode 100644 CI/windows/prepare-plugin-windows.cmd diff --git a/CI/linux/build-plugin-ubuntu.sh b/CI/linux/build-plugin-ubuntu.sh deleted file mode 100644 index 584242f4..00000000 --- a/CI/linux/build-plugin-ubuntu.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -ex - -echo "[obs-websocket] Running CMake.." -mkdir build && cd build -cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_UBUNTU_FIX=true .. - -echo "[obs-websocket] Building plugin.." -make -j4 diff --git a/CI/linux/install-dependencies-ubuntu.sh b/CI/linux/install-dependencies-ubuntu.sh deleted file mode 100644 index 43cd58f1..00000000 --- a/CI/linux/install-dependencies-ubuntu.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -set -ex - -echo "[obs-websocket] Installing obs-studio PPA and updates.." -sudo add-apt-repository -y ppa:obsproject/obs-studio -sudo apt-get -qq update - -echo "[obs-websocket] Installing obs-studio and dependencies.." -sudo apt-get install -y \ - libc-dev-bin \ - libc6-dev git \ - build-essential \ - checkinstall \ - cmake \ - obs-studio \ - qtbase5-dev - -echo "[obs-websocket] Installed OBS Version: $(obs --version)" - -ls /usr/include/ -ls /usr/include/obs/ - -# Dirty hack -sudo wget -O /usr/include/obs/obs-frontend-api.h https://raw.githubusercontent.com/obsproject/obs-studio/26.1.2/UI/obs-frontend-api/obs-frontend-api.h - -sudo ldconfig diff --git a/CI/linux/package-plugin-ubuntu.sh b/CI/linux/package-plugin-ubuntu.sh deleted file mode 100644 index fb3aac46..00000000 --- a/CI/linux/package-plugin-ubuntu.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -set -e - -export GIT_HASH=$(git rev-parse --short HEAD) -export PKG_VERSION="1-$GIT_HASH-$BRANCH_SHORT_NAME-git" - -if [[ $BRANCH_FULL_NAME =~ ^refs/tags/ ]]; then - export PKG_VERSION="$BRANCH_SHORT_NAME" - echo "[obs-websocket] Branch is a tag. Setting version to $PKG_VERSION." -fi - -cd ./build - -PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \ - --backup=no --deldoc=yes --install=no \ - --pkgname=obs-websocket --pkgversion="$PKG_VERSION" \ - --pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \ - --pkggroup="video" \ - --pkgsource="https://github.com/Palakis/obs-websocket" \ - --requires="obs-studio \(\>= 26.1.0\), libqt5core5a, libqt5widgets5, qt5-image-formats-plugins" \ - --pakdir="../package" - -sudo chmod ao+r ../package/* diff --git a/CI/windows/download-obs-deps.cmd b/CI/windows/download-obs-deps.cmd deleted file mode 100644 index 2baf5ec4..00000000 --- a/CI/windows/download-obs-deps.cmd +++ /dev/null @@ -1,7 +0,0 @@ -if exist %DEPS_BASE_PATH% ( - echo "OBS dependencies found. Download skipped." -) else ( - echo "OBS dependencies not found. Downloading..." - curl -o %DEPS_BASE_PATH%.zip -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2019.zip -f --retry 5 -C - - 7z x %DEPS_BASE_PATH%.zip -o%DEPS_BASE_PATH% -) diff --git a/CI/windows/install-qt-win.cmd b/CI/windows/install-qt-win.cmd deleted file mode 100644 index 39abd6ba..00000000 --- a/CI/windows/install-qt-win.cmd +++ /dev/null @@ -1,8 +0,0 @@ -if exist %QT_BASE_DIR% ( - echo "Qt directory found. Download skipped." -) else ( - echo "Qt directory not found. Downloading..." - curl -kLO https://tt2468.net/dl/Qt_5.15.2.7z -f --retry 5 -C - - 7z x Qt_5.15.2.7z -o%QT_BASE_DIR% -) -dir %QT_BASE_DIR% diff --git a/CI/windows/package-plugin-windows.cmd b/CI/windows/package-plugin-windows.cmd deleted file mode 100644 index e3c3d445..00000000 --- a/CI/windows/package-plugin-windows.cmd +++ /dev/null @@ -1,12 +0,0 @@ -mkdir package -cd package - -git rev-parse --short HEAD > package-version.txt -set /p PackageVersion= "%OBS_PATH%\obs-studio-latest-tag.txt" - set /p OBS_LATEST_TAG=<"%OBS_PATH%\obs-studio-latest-tag.txt" -) - -REM Prepare OBS Studio builds - -echo Running CMake... -cd /D %OBS_PATH% -echo git checkout %OBS_LATEST_TAG% -git checkout %OBS_LATEST_TAG% -echo: - -if not exist build32 mkdir build32 -if not exist build64 mkdir build64 - -echo Running cmake for obs-studio %OBS_LATEST_TAG% 32-bit... -cd build32 -cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR32%" -DDepsPath="%DEPS_PATH_32%" -DDISABLE_PLUGINS=true -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. -echo: -echo: - -echo Running cmake for obs-studio %OBS_LATEST_TAG% 64-bit... -cd ..\build64 -cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR64%" -DDepsPath="%DEPS_PATH_64%" -DDISABLE_PLUGINS=true -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. -echo: -echo: - -dir "%OBS_PATH%\libobs" diff --git a/CI/windows/prepare-plugin-windows.cmd b/CI/windows/prepare-plugin-windows.cmd deleted file mode 100644 index 08bfdafd..00000000 --- a/CI/windows/prepare-plugin-windows.cmd +++ /dev/null @@ -1,7 +0,0 @@ -mkdir build32 -mkdir build64 - -cd build32 -cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR32%" -DLibObs_DIR="%OBS_PATH%\build32\libobs" -DLIBOBS_INCLUDE_DIR="%OBS_PATH%\libobs" -DLIBOBS_LIB="%OBS_PATH%\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBS_PATH%\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. -cd ..\build64 -cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR64%" -DLibObs_DIR="%OBS_PATH%\build64\libobs" -DLIBOBS_INCLUDE_DIR="%OBS_PATH%\libobs" -DLIBOBS_LIB="%OBS_PATH%\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBS_PATH%\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..