From 8b32f83d029f4a9e5d95a6502de022e2884c7cda Mon Sep 17 00:00:00 2001 From: Joel Bethke Date: Mon, 4 May 2020 19:20:05 -0500 Subject: [PATCH] Bump version number to prepare for release --- installer/installer.iss | 80 ------------------------------- src/virtual-output/CMakeLists.txt | 4 +- src/virtual-source/CMakeLists.txt | 4 +- 3 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 installer/installer.iss diff --git a/installer/installer.iss b/installer/installer.iss deleted file mode 100644 index 9a46aa5..0000000 --- a/installer/installer.iss +++ /dev/null @@ -1,80 +0,0 @@ -; InnoSetupVersion=6.0.4 - -#define MyAppName "OBS-Virtualcam" -#define MyAppVersion "2.0.4" -#define MyAppPublisher "Joel Bethke" -#define MyAppURL "https://github.com/Fenrirthviti/obs-virtual-cam" - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{F1E7B1CC-0007-43C2-92C2-66334C1EED67} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={code:GetDirName} -DefaultGroupName={#MyAppName} -OutputBaseFilename=OBS-Virtualcam-{#MyAppName}-Installer -Compression=lzma -SolidCompression=yes - -[Files] -Source: "..\build-package\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\LICENSE"; Flags: dontcopy - -[Icons] -Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" -Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" - -[Run] -Filename: "{sys}\regsvr32.exe"; Parameters: "/n /i:""1"" obs-virtualsource.dll"; WorkingDir: "{app}\bin\64bit"; Check: WizardIsTaskSelected('task1'); MinVersion: 0.0,5.0; -Filename: "{sys}\regsvr32.exe"; Parameters: "/n /i:""1"" obs-virtualsource.dll"; WorkingDir: "{app}\bin\32bit"; Check: WizardIsTaskSelected('task1'); MinVersion: 0.0,5.0; -Filename: "{sys}\regsvr32.exe"; Parameters: "obs-virtualsource.dll"; WorkingDir: "{app}\bin\64bit"; Check: WizardIsTaskSelected('task2'); MinVersion: 0.0,5.0; -Filename: "{sys}\regsvr32.exe"; Parameters: "obs-virtualsource.dll"; WorkingDir: "{app}\bin\32bit"; Check: WizardIsTaskSelected('task2'); MinVersion: 0.0,5.0; - -[UninstallRun] -Filename: "{sys}\regsvr32.exe"; Parameters: "/u /s obs-virtualsource.dll"; WorkingDir: "{app}\bin\64bit"; MinVersion: 0.0,5.0; -Filename: "{sys}\regsvr32.exe"; Parameters: "/u /s obs-virtualsource.dll"; WorkingDir: "{app}\bin\32bit"; MinVersion: 0.0,5.0; - -[Tasks] -Name: "task1"; Description: "1. Install plugin and register 1 virtual camera"; MinVersion: 0.0,5.0; Flags: exclusive -Name: "task2"; Description: "2. Install plugin and register 4 virtual cameras"; MinVersion: 0.0,5.0; Flags: exclusive unchecked - -[UninstallDelete] -Type: files; Name: "{app}\bin\64bit\obs-virtualsource.dll"; -Type: files; Name: "{app}\bin\32bit\obs-virtualsource.dll"; - -[Code] -procedure InitializeWizard(); -var - GPLText: AnsiString; - Page: TOutputMsgMemoWizardPage; -begin - ExtractTemporaryFile('LICENSE'); - LoadStringFromFile(ExpandConstant('{tmp}\LICENSE'), GPLText); - - Page := CreateOutputMsgMemoPage(wpWelcome, - 'License Information', 'Please review the license terms before installing OBS-Virtualcam', - 'Press Page Down to see the rest of the agreement. Once you are aware of your rights, click Next to continue.', - String(GPLText) - ); -end; - -// credit where it's due : -// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45 -function GetDirName(Value: string): string; -var - InstallPath: string; -begin - // initialize default path, which will be returned when the following registry - // key queries fail due to missing keys or for some different reason - Result := '{pf}\obs-studio'; - // query the first registry value; if this succeeds, return the obtained value - if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then - Result := InstallPath -end; diff --git a/src/virtual-output/CMakeLists.txt b/src/virtual-output/CMakeLists.txt index 6e7358f..844562e 100644 --- a/src/virtual-output/CMakeLists.txt +++ b/src/virtual-output/CMakeLists.txt @@ -54,8 +54,8 @@ set(virtualoutput_HEADERS if(WIN32) set(OBS_VIRTUALOUTPUT_VERSION_MAJOR 2) set(OBS_VIRTUALOUTPUT_VERSION_MINOR 0) - set(OBS_VIRTUALOUTPUT_VERSION_PATCH 4) - set(OBS_VIRTUALOUTPUT_VERSION_STRING "2.0.4") + set(OBS_VIRTUALOUTPUT_VERSION_PATCH 5) + set(OBS_VIRTUALOUTPUT_VERSION_STRING "2.0.5") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualoutput.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/virtualoutput.rc) endif() diff --git a/src/virtual-source/CMakeLists.txt b/src/virtual-source/CMakeLists.txt index 5fe1944..aac7bf9 100644 --- a/src/virtual-source/CMakeLists.txt +++ b/src/virtual-source/CMakeLists.txt @@ -24,8 +24,8 @@ set(virtualsource_HEADERS if(WIN32) set(OBS_VIRTUALSOURCE_VERSION_MAJOR 2) set(OBS_VIRTUALSOURCE_VERSION_MINOR 0) - set(OBS_VIRTUALSOURCE_VERSION_PATCH 4) - set(OBS_VIRTUALSOURCE_VERSION_STRING "2.0.4") + set(OBS_VIRTUALSOURCE_VERSION_PATCH 5) + set(OBS_VIRTUALSOURCE_VERSION_STRING "2.0.5") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualsource.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/virtualsource.rc) endif()