From a25427c7cc4b4f0f6ac96ebe2723fc3db8906f22 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Sat, 2 Jul 2022 11:06:43 -0700 Subject: [PATCH] base: Final changes before release --- .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + .github/workflows/main.yml | 4 +- installer/installer-windows.iss.in | 148 ++++++++++++------------- 3 files changed, 77 insertions(+), 76 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 8396194e4..223888846 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -75,6 +75,7 @@ body: label: obs-websocket Version description: What version of obs-websocket are you using? options: + - 5.0.0 - 5.0.0-beta1 - 5.0.0-alpha3 - 5.0.0-alpha2 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dea39c879..aa5a24f44 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -334,9 +334,9 @@ jobs: cd ./build sudo checkinstall -y --type=debian --fstrans=no -nodoc \ --backup=no --deldoc=yes --install=no --pkgname=obs-websocket --pkgversion="$CHECKINSTALL_VERSION" \ - --pkglicense="GPLv2.0" --maintainer="${{ github.event.pusher.email }}" --pkggroup="video" \ + --pkglicense="GPLv2.0" --maintainer="tt2468@irltoolkit.com" --pkggroup="video" \ --pkgsource="${{ github.event.repository.html_url }}" \ - --requires="obs-studio,libqt5network5,libqt5concurrent5,qt5-image-formats-plugins" \ + --requires="obs-studio,libqt5network5,qt5-image-formats-plugins" \ --pakdir="../package" sudo chmod ao+r ../package/* sudo mv ../package/* ../package/${{ env.LINUX_FILENAME }} diff --git a/installer/installer-windows.iss.in b/installer/installer-windows.iss.in index 6bcad060b..94be8ac5b 100644 --- a/installer/installer-windows.iss.in +++ b/installer/installer-windows.iss.in @@ -1,74 +1,74 @@ -#define MyAppName "obs-websocket" -#define MyAppVersion "@OBS_WEBSOCKET_VERSION@" -#define MyAppPublisher "obs-websocket" -#define MyAppURL "http://github.com/obsproject/obs-websocket" - -[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={{117EE44F-48E1-49E5-A381-CC8D9195CF35} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={code:GetDirName} -DefaultGroupName={#MyAppName} -OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer -Compression=lzma -SolidCompression=yes -DirExistsWarning=no - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Files] -Source: "..\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\LICENSE"; Flags: dontcopy -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" -Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" - -[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-websocket', - 'Press Page Down to see the rest of the agreement. Once you are aware of your rights, click Next to continue.', - String(GPLText) - ); -end; - -// Validate that obs-studio is installed before installing the plugin -function PrepareToInstall(var NeedsRestart: Boolean): String; -begin - Result := ''; - - if not DirExists(ExpandConstant('{app}\obs-plugins')) then - begin - Result := 'The selected install directory does not appear to be valid. Please install OBS Studio before installing {#MyAppName} or correct your install path.'; - end; -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 := '{commonpf}\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; +#define MyAppName "obs-websocket" +#define MyAppVersion "@OBS_WEBSOCKET_VERSION@" +#define MyAppPublisher "OBS Project" +#define MyAppURL "http://github.com/obsproject/obs-websocket" + +[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={{117EE44F-48E1-49E5-A381-CC8D9195CF35} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={code:GetDirName} +DefaultGroupName={#MyAppName} +OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer +Compression=lzma +SolidCompression=yes +DirExistsWarning=no + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Files] +Source: "..\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\LICENSE"; Flags: dontcopy +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" + +[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-websocket', + 'Press Page Down to see the rest of the agreement. Once you are aware of your rights, click Next to continue.', + String(GPLText) + ); +end; + +// Validate that obs-studio is installed before installing the plugin +function PrepareToInstall(var NeedsRestart: Boolean): String; +begin + Result := ''; + + if not DirExists(ExpandConstant('{app}\obs-plugins')) then + begin + Result := 'The selected install directory does not appear to be valid. Please install OBS Studio before installing {#MyAppName} or correct your install path.'; + end; +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 := '{commonpf}\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;