From 74fb3a3847bb280dcf4b949f347b155cdef53044 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Fri, 28 Jun 2019 20:45:56 +0200 Subject: [PATCH] ci: Fix package names and always build packages --- ci/appveyor-build.js | 4 ++-- ci/appveyor-package.bat | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/appveyor-build.js b/ci/appveyor-build.js index f43946c..722f363 100644 --- a/ci/appveyor-build.js +++ b/ci/appveyor-build.js @@ -7,7 +7,7 @@ var config32 = cp.spawn( '-G"Visual Studio 15 2017"', '-DCMAKE_INSTALL_PREFIX="build/distrib"', '-DCMAKE_PACKAGE_PREFIX="build"', - '-DCMAKE_PACKAGE_NAME="obs-stream-effects"' + '-DCMAKE_PACKAGE_NAME="xmr-ffmpeg-encoders"' ], { windowsVerbatimArguments: true, windowsHide: true @@ -55,7 +55,7 @@ var config64 = cp.spawn( '-G"Visual Studio 15 2017 Win64"', '-DCMAKE_INSTALL_PREFIX="build/distrib"', '-DCMAKE_PACKAGE_PREFIX="build"', - '-DCMAKE_PACKAGE_NAME="obs-stream-effects"' + '-DCMAKE_PACKAGE_NAME="xmr-ffmpeg-encoders"' ], { windowsVerbatimArguments: true, windowsHide: true diff --git a/ci/appveyor-package.bat b/ci/appveyor-package.bat index ebf2cb3..b46f087 100644 --- a/ci/appveyor-package.bat +++ b/ci/appveyor-package.bat @@ -1,9 +1,7 @@ @ECHO OFF -IF "%APPVEYOR_REPO_TAG%"=="true" ( - ECHO -- Building 7z Archive -- - cmake --build build/64 --target PACKAGE_7Z --config RelWithDebInfo - ECHO -- Building Zip Archive -- - cmake --build build/64 --target PACKAGE_ZIP --config RelWithDebInfo - ECHO -- Building Installer -- - "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /Qp ".\build\64\installer.iss" > nul -) \ No newline at end of file +ECHO -- Building 7z Archive -- +cmake --build build/64 --target PACKAGE_7Z --config RelWithDebInfo +ECHO -- Building Zip Archive -- +cmake --build build/64 --target PACKAGE_ZIP --config RelWithDebInfo +ECHO -- Building Installer -- +"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /Qp ".\build\64\installer.iss" > nul