Skip to content

Commit b0be05c

Browse files
committed
removed all support for prior to windows 10
updated images to bearsampp images.
1 parent 7698377 commit b0be05c

File tree

10 files changed

+3
-44
lines changed

10 files changed

+3
-44
lines changed

build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
prerequisites.release = 2022.07.19
1+
prerequisites.release = 2022.07.23
22
prerequisites.id = prerequisites
33
prerequisites.name = Bearsampp Prerequisites Package
44
prerequisites.setupname = Bearsampp-prerequisites-${prerequisites.release}

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- bearsampp dev -->
1010
<property name="dev.path" location="${root.dir}/dev"/>
1111
<fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
12-
<echo message="bearsampp dev found in ${dev.path}" level="debug"/>
12+
<echo message="Bearsampp dev found in ${dev.path}" level="debug"/>
1313

1414
<!-- Import build-commons.xml -->
1515
<import file="${dev.path}/build/build-commons.xml"/>

img/prerequisites.png

-30.7 KB
Binary file not shown.

setup/before.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ This setup provides all the prerequisites required for Bearsampp :
44
- Visual C++ 2013 Runtimes (VC13)
55
- Visual C++ 2015-2019 Runtimes (VC14 VC15 VC16)
66
- Visual C++ 2015-2022 Runtimes (VC14 VC15 VC16 VC17)
7-
- KB838079 : Integrated for Windows XP to install Windows Support Tools.
8-
- KB2731284 : Fix "33" DOS error code when memory memory-mapped files are cleaned by using the FlushViewOfFile() function in Windows 7.
97

108
Website : https://bearsampp.com

setup/prerequisites.bmp

151 KB
Binary file not shown.

setup/prerequisites.png

-30.7 KB
Binary file not shown.

setup/setup.iss

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ AppPublisherURL={#appURL}
1515
AppSupportURL={#appURL}
1616
AppUpdatesURL={#appURL}
1717

18-
WizardImageFile=prerequisites.png
18+
WizardImageFile=prerequisites.bmp
1919
WizardSmallImageFile=bearsampp.bmp
2020
DisableWelcomePage=no
2121
ShowLanguageDialog=yes
@@ -49,30 +49,9 @@ Filename: "{tmp}\{#appId}\vcredist_2013\vcredist_x64.exe"; Parameters: "/quiet /
4949
Filename: "{tmp}\{#appId}\vcredist_2015_2019\vc_redist.x86.exe"; Parameters: "/quiet /norestart"; StatusMsg: Installing Visual C++ 2015-2019 Runtimes x86 (VC14 VC15 VC16)...; Flags: runhidden waituntilterminated
5050
Filename: "{tmp}\{#appId}\vcredist_2015_2019\vc_redist.x64.exe"; Parameters: "/quiet /norestart"; StatusMsg: Installing Visual C++ 2015-2019 Runtimes x64 (VC14 VC15 VC16)...; Check: IsWin64; Flags: runhidden waituntilterminated
5151
Filename: "{tmp}\{#appId}\vcredist_2015_2022\vc_redist.x64.exe"; Parameters: "/quiet /norestart"; StatusMsg: Installing Visual C++ 2015-2022 Runtimes x64 (VC14 VC15 VC16 VC17)...; Check: IsWin64; Flags: runhidden waituntilterminated
52-
Filename: "wusa.exe"; Parameters: """{tmp}\{#appId}\KB2731284\Windows6.1-KB2731284-v3-x86.msu"" /quiet /norestart"; StatusMsg: Installing KB2731284 x86...; Check: InstallKB2731284x86; Flags: runhidden waituntilterminated
53-
Filename: "wusa.exe"; Parameters: """{tmp}\{#appId}\KB2731284\Windows6.1-KB2731284-v3-x86.msu"" /quiet /norestart"; StatusMsg: Installing KB2731284 x64...; Check: InstallKB2731284x64; Flags: runhidden waituntilterminated
54-
Filename: "{tmp}\{#appId}\KB838079\WindowsXP-KB838079-SupportTools-ENU.exe"; Parameters: "/Q /C:""msiexec.exe /qb /i suptools.msi REBOOT=ReallySuppress ADDLOCAL=ALL"""; StatusMsg: Installing KB838079...; Check: InstallKB838079; Flags: runhidden waituntilterminated
5552

5653
[Code]
5754
58-
function IsWinXP: boolean;
59-
var
60-
Version: TWindowsVersion;
61-
begin
62-
GetWindowsVersionEx(Version);
63-
if (Version.Major = 5) and (Version.Minor = 1) then
64-
result := true;
65-
end;
66-
67-
function IsWin7: boolean;
68-
var
69-
Version: TWindowsVersion;
70-
begin
71-
GetWindowsVersionEx(Version);
72-
if (Version.Major = 6) and (Version.Minor = 1) then
73-
result := true;
74-
end;
75-
7655
function IsKBInstalled(KB: string): Boolean;
7756
var
7857
WbemLocator: Variant;
@@ -86,21 +65,3 @@ begin
8665
WbemObjectSet := WbemServices.ExecQuery(WQLQuery);
8766
Result := (not VarIsNull(WbemObjectSet)) and (WbemObjectSet.Count > 0);
8867
end;
89-
90-
function InstallKB2731284x86: boolean;
91-
begin
92-
if IsWin7 and not IsKBInstalled('KB2731284') then
93-
result := true;
94-
end;
95-
96-
function InstallKB2731284x64: boolean;
97-
begin
98-
if IsWin7 and IsWin64 and not IsKBInstalled('KB2731284') then
99-
result := true;
100-
end;
101-
102-
function InstallKB838079: boolean;
103-
begin
104-
if IsWinXP and not IsKBInstalled('KB838079') then
105-
result := true;
106-
end;
-985 KB
Binary file not shown.
-724 KB
Binary file not shown.
-4.71 MB
Binary file not shown.

0 commit comments

Comments
 (0)