ci: Fix package names and always build packages

This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-06-28 20:45:56 +02:00
parent 2d131b8566
commit 74fb3a3847
2 changed files with 8 additions and 10 deletions
+2 -2
View File
@@ -7,7 +7,7 @@ var config32 = cp.spawn(
'-G"Visual Studio 15 2017"', '-G"Visual Studio 15 2017"',
'-DCMAKE_INSTALL_PREFIX="build/distrib"', '-DCMAKE_INSTALL_PREFIX="build/distrib"',
'-DCMAKE_PACKAGE_PREFIX="build"', '-DCMAKE_PACKAGE_PREFIX="build"',
'-DCMAKE_PACKAGE_NAME="obs-stream-effects"' '-DCMAKE_PACKAGE_NAME="xmr-ffmpeg-encoders"'
], { ], {
windowsVerbatimArguments: true, windowsVerbatimArguments: true,
windowsHide: true windowsHide: true
@@ -55,7 +55,7 @@ var config64 = cp.spawn(
'-G"Visual Studio 15 2017 Win64"', '-G"Visual Studio 15 2017 Win64"',
'-DCMAKE_INSTALL_PREFIX="build/distrib"', '-DCMAKE_INSTALL_PREFIX="build/distrib"',
'-DCMAKE_PACKAGE_PREFIX="build"', '-DCMAKE_PACKAGE_PREFIX="build"',
'-DCMAKE_PACKAGE_NAME="obs-stream-effects"' '-DCMAKE_PACKAGE_NAME="xmr-ffmpeg-encoders"'
], { ], {
windowsVerbatimArguments: true, windowsVerbatimArguments: true,
windowsHide: true windowsHide: true
+6 -8
View File
@@ -1,9 +1,7 @@
@ECHO OFF @ECHO OFF
IF "%APPVEYOR_REPO_TAG%"=="true" ( ECHO -- Building 7z Archive --
ECHO -- Building 7z Archive -- cmake --build build/64 --target PACKAGE_7Z --config RelWithDebInfo
cmake --build build/64 --target PACKAGE_7Z --config RelWithDebInfo ECHO -- Building Zip Archive --
ECHO -- Building Zip Archive -- cmake --build build/64 --target PACKAGE_ZIP --config RelWithDebInfo
cmake --build build/64 --target PACKAGE_ZIP --config RelWithDebInfo ECHO -- Building Installer --
ECHO -- Building Installer -- "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /Qp ".\build\64\installer.iss" > nul
"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /Qp ".\build\64\installer.iss" > nul
)