Skip to content

Commit 99c4e7e

Browse files
committed
fix(setup): adjustments for new plugin bundles
1 parent 697f81e commit 99c4e7e

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

InnoSetup/Elite Observatory - Wine.iss

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@ Name: "{app}\plugins"; Permissions: users-modify
5858
[Files]
5959
Source: "..\ObservatoryCore\bin\Proton\publish\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
6060
Source: "..\ObservatoryCore\bin\Proton\publish\*"; Excludes: "\plugins\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
61-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryExplorer.dll"; DestDir: "{app}\plugins"; Components: Plugins\Explorer
62-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\deps\lua54.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer
63-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\deps\KeraLua.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer
64-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\deps\NLua.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer
65-
;Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryHerald.dll"; DestDir: "{app}\plugins"; Components: Plugins\Herald
66-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryBotanist.dll"; DestDir: "{app}\plugins"; Components: Plugins\Botanist
61+
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryExplorer.eop"; DestDir: "{app}\plugins"; Components: Plugins\Explorer
62+
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryBotanist.eop"; DestDir: "{app}\plugins"; Components: Plugins\Botanist
6763

6864
[Icons]
6965
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
@@ -79,4 +75,14 @@ Root: HKA; Subkey: "Software\Classes\ObservatoryPlugin.eop\DefaultIcon"; ValueTy
7975
Root: HKA; Subkey: "Software\Classes\ObservatoryPlugin.eop\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
8076
Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".eop"; ValueData: ""
8177

78+
[InstallDelete]
79+
Type: files; Name: "{app}\Observatory*.pdb"
80+
Type: files; Name: "{app}\Avalonia*.dll"
81+
Type: files; Name: "{app}\Egorozh*.dll"
82+
Type: files; Name: "{app}\plugins\ObservatoryExplorer.dll"
83+
Type: files; Name: "{app}\plugins\ObservatoryBotanist.dll"
84+
Type: files; Name: "{app}\plugins\deps\KeraLua.dll"
85+
Type: files; Name: "{app}\plugins\deps\lua54.dll"
86+
Type: files; Name: "{app}\plugins\deps\NLua.dll"
87+
8288
[Code]

InnoSetup/Elite Observatory.iss

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,15 @@ Name: "Core"; Description: "Core Elite Observatory Application"; Flags: fixed; T
5050
Name: "Plugins"; Description: "Optional Observatory Plugins"; Types: Full
5151
Name: "Plugins\Explorer"; Description: "Explorer: Plugin for finding interesting objects while exploring."; Types: Full
5252
Name: "Plugins\Botanist"; Description: "Botanist: Plugin for tracking surface biological signals scanned while on foot."; Types: Full
53-
;Name: "Plugins\Herald"; Description: "Herald: Plugin for cloud-based high quality speech notifications via Microsoft Azure Cognitive Services."; Types: Full
5453

5554
[Dirs]
5655
Name: "{app}\plugins"; Permissions: users-modify
5756

5857
[Files]
5958
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\publish\framework-dependent\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
6059
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\publish\framework-dependent\*"; Excludes: "\plugins\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
61-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryExplorer.dll"; DestDir: "{app}\plugins"; Components: Plugins\Explorer
62-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\deps\lua54.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer
63-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\deps\KeraLua.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer
64-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\deps\NLua.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer
65-
;Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryHerald.dll"; DestDir: "{app}\plugins"; Components: Plugins\Herald
66-
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryBotanist.dll"; DestDir: "{app}\plugins"; Components: Plugins\Botanist
60+
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryExplorer.eop"; DestDir: "{app}\plugins"; Components: Plugins\Explorer
61+
Source: "..\ObservatoryCore\bin\Release\net8.0-windows7.0\plugins\ObservatoryBotanist.eop"; DestDir: "{app}\plugins"; Components: Plugins\Botanist
6762
Source: ".\netcorecheck.exe"; Flags: dontcopy noencryption
6863

6964
[Icons]
@@ -84,7 +79,11 @@ Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes
8479
Type: files; Name: "{app}\Observatory*.pdb"
8580
Type: files; Name: "{app}\Avalonia*.dll"
8681
Type: files; Name: "{app}\Egorozh*.dll"
87-
Type: files; Name: "{app}\plugins\ObservatoryHerald.dll"
82+
Type: files; Name: "{app}\plugins\ObservatoryExplorer.dll"
83+
Type: files; Name: "{app}\plugins\ObservatoryBotanist.dll"
84+
Type: files; Name: "{app}\plugins\deps\KeraLua.dll"
85+
Type: files; Name: "{app}\plugins\deps\lua54.dll"
86+
Type: files; Name: "{app}\plugins\deps\NLua.dll"
8887

8988
[Code]
9089

0 commit comments

Comments
 (0)