Skip to content

Commit a25427c

Browse files
tt2468tt2468
committed
base: Final changes before release
1 parent 99f93c4 commit a25427c

File tree

3 files changed

+77
-76
lines changed

3 files changed

+77
-76
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ body:
7575
label: obs-websocket Version
7676
description: What version of obs-websocket are you using?
7777
options:
78+
- 5.0.0
7879
- 5.0.0-beta1
7980
- 5.0.0-alpha3
8081
- 5.0.0-alpha2

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ jobs:
334334
cd ./build
335335
sudo checkinstall -y --type=debian --fstrans=no -nodoc \
336336
--backup=no --deldoc=yes --install=no --pkgname=obs-websocket --pkgversion="$CHECKINSTALL_VERSION" \
337-
--pkglicense="GPLv2.0" --maintainer="${{ github.event.pusher.email }}" --pkggroup="video" \
337+
--pkglicense="GPLv2.0" --maintainer="[email protected]" --pkggroup="video" \
338338
--pkgsource="${{ github.event.repository.html_url }}" \
339-
--requires="obs-studio,libqt5network5,libqt5concurrent5,qt5-image-formats-plugins" \
339+
--requires="obs-studio,libqt5network5,qt5-image-formats-plugins" \
340340
--pakdir="../package"
341341
sudo chmod ao+r ../package/*
342342
sudo mv ../package/* ../package/${{ env.LINUX_FILENAME }}

‎installer/installer-windows.iss.in‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
1-
#define MyAppName "obs-websocket"
2-
#define MyAppVersion "@OBS_WEBSOCKET_VERSION@"
3-
#define MyAppPublisher "obs-websocket"
4-
#define MyAppURL "http://github.com/obsproject/obs-websocket"
5-
6-
[Setup]
7-
; NOTE: The value of AppId uniquely identifies this application.
8-
; Do not use the same AppId value in installers for other applications.
9-
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
10-
AppId={{117EE44F-48E1-49E5-A381-CC8D9195CF35}
11-
AppName={#MyAppName}
12-
AppVersion={#MyAppVersion}
13-
AppPublisher={#MyAppPublisher}
14-
AppPublisherURL={#MyAppURL}
15-
AppSupportURL={#MyAppURL}
16-
AppUpdatesURL={#MyAppURL}
17-
DefaultDirName={code:GetDirName}
18-
DefaultGroupName={#MyAppName}
19-
OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer
20-
Compression=lzma
21-
SolidCompression=yes
22-
DirExistsWarning=no
23-
24-
[Languages]
25-
Name: "english"; MessagesFile: "compiler:Default.isl"
26-
27-
[Files]
28-
Source: "..\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
29-
Source: "..\LICENSE"; Flags: dontcopy
30-
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
31-
32-
[Icons]
33-
Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
34-
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
35-
36-
[Code]
37-
procedure InitializeWizard();
38-
var
39-
GPLText: AnsiString;
40-
Page: TOutputMsgMemoWizardPage;
41-
begin
42-
ExtractTemporaryFile('LICENSE');
43-
LoadStringFromFile(ExpandConstant('{tmp}\LICENSE'), GPLText);
44-
Page := CreateOutputMsgMemoPage(wpWelcome,
45-
'License Information', 'Please review the license terms before installing obs-websocket',
46-
'Press Page Down to see the rest of the agreement. Once you are aware of your rights, click Next to continue.',
47-
String(GPLText)
48-
);
49-
end;
50-
51-
// Validate that obs-studio is installed before installing the plugin
52-
function PrepareToInstall(var NeedsRestart: Boolean): String;
53-
begin
54-
Result := '';
55-
56-
if not DirExists(ExpandConstant('{app}\obs-plugins')) then
57-
begin
58-
Result := 'The selected install directory does not appear to be valid. Please install OBS Studio before installing {#MyAppName} or correct your install path.';
59-
end;
60-
end;
61-
62-
// credit where it's due :
63-
// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
64-
function GetDirName(Value: string): string;
65-
var
66-
InstallPath: string;
67-
begin
68-
// initialize default path, which will be returned when the following registry
69-
// key queries fail due to missing keys or for some different reason
70-
Result := '{commonpf}\obs-studio';
71-
// query the first registry value; if this succeeds, return the obtained value
72-
if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
73-
Result := InstallPath
74-
end;
1+
#define MyAppName "obs-websocket"
2+
#define MyAppVersion "@OBS_WEBSOCKET_VERSION@"
3+
#define MyAppPublisher "OBS Project"
4+
#define MyAppURL "http://github.com/obsproject/obs-websocket"
5+
6+
[Setup]
7+
; NOTE: The value of AppId uniquely identifies this application.
8+
; Do not use the same AppId value in installers for other applications.
9+
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
10+
AppId={{117EE44F-48E1-49E5-A381-CC8D9195CF35}
11+
AppName={#MyAppName}
12+
AppVersion={#MyAppVersion}
13+
AppPublisher={#MyAppPublisher}
14+
AppPublisherURL={#MyAppURL}
15+
AppSupportURL={#MyAppURL}
16+
AppUpdatesURL={#MyAppURL}
17+
DefaultDirName={code:GetDirName}
18+
DefaultGroupName={#MyAppName}
19+
OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer
20+
Compression=lzma
21+
SolidCompression=yes
22+
DirExistsWarning=no
23+
24+
[Languages]
25+
Name: "english"; MessagesFile: "compiler:Default.isl"
26+
27+
[Files]
28+
Source: "..\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
29+
Source: "..\LICENSE"; Flags: dontcopy
30+
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
31+
32+
[Icons]
33+
Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
34+
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
35+
36+
[Code]
37+
procedure InitializeWizard();
38+
var
39+
GPLText: AnsiString;
40+
Page: TOutputMsgMemoWizardPage;
41+
begin
42+
ExtractTemporaryFile('LICENSE');
43+
LoadStringFromFile(ExpandConstant('{tmp}\LICENSE'), GPLText);
44+
Page := CreateOutputMsgMemoPage(wpWelcome,
45+
'License Information', 'Please review the license terms before installing obs-websocket',
46+
'Press Page Down to see the rest of the agreement. Once you are aware of your rights, click Next to continue.',
47+
String(GPLText)
48+
);
49+
end;
50+
51+
// Validate that obs-studio is installed before installing the plugin
52+
function PrepareToInstall(var NeedsRestart: Boolean): String;
53+
begin
54+
Result := '';
55+
56+
if not DirExists(ExpandConstant('{app}\obs-plugins')) then
57+
begin
58+
Result := 'The selected install directory does not appear to be valid. Please install OBS Studio before installing {#MyAppName} or correct your install path.';
59+
end;
60+
end;
61+
62+
// credit where it's due :
63+
// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
64+
function GetDirName(Value: string): string;
65+
var
66+
InstallPath: string;
67+
begin
68+
// initialize default path, which will be returned when the following registry
69+
// key queries fail due to missing keys or for some different reason
70+
Result := '{commonpf}\obs-studio';
71+
// query the first registry value; if this succeeds, return the obtained value
72+
if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
73+
Result := InstallPath
74+
end;

0 commit comments

Comments
 (0)