Skip to content

Commit 6f027ea

Browse files
UnrealKaraulovUnrealKaraulov
committed
Test XP
1 parent 553a507 commit 6f027ea

File tree

10 files changed

+707
-49
lines changed

10 files changed

+707
-49
lines changed

‎.github/workflows/build.yml

+30-44
Original file line numberDiff line numberDiff line change
@@ -69,49 +69,6 @@ jobs:
6969
with:
7070
fetch-depth: 0
7171
submodules: true
72-
- uses: microsoft/setup-msbuild@v2
73-
- name: Install Windows XP Support for Visual Studio
74-
run: |
75-
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
76-
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
77-
$componentsToAdd = @(
78-
"Microsoft.VisualStudio.Component.WinXP"
79-
)
80-
[string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " + $_}
81-
$Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
82-
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
83-
if ($process.ExitCode -eq 0)
84-
{
85-
Write-Host "components have been successfully added"
86-
Get-ChildItem C:\ProgramData\Microsoft\VisualStudio\Packages\Microsoft.Windows.XPSupport.*
87-
}
88-
else
89-
{
90-
Write-Host "components were not installed"
91-
exit 1
92-
}
93-
- name: Set up Visual Studio shell
94-
uses: egor-tensin/vs-shell@v2
95-
with:
96-
arch: Win32
97-
- name: Build XP
98-
run: |
99-
msbuild ${{ env.solution }} -m /p:Configuration=ReleaseXPx86 /p:Platform=Win32
100-
- name: Create Windows release WinXP archive
101-
run: >
102-
mkdir -p build\win32_release
103-
104-
cp vs-project\Release\bspguy.exe build\win32_release\
105-
106-
xcopy /I /E /Y "resources\*" "build\win32_release\"
107-
108-
Compress-Archive -Path "build\win32_release\*" -DestinationPath "build\newbspguy_winxp_x86_release.zip"
109-
- name: Publish nightly release binaries for windows XP 32bit
110-
uses: softprops/action-gh-release@v1
111-
with:
112-
tag_name: ${{ needs.get_time_build.outputs.release_tag }}
113-
files: |
114-
build/newbspguy_winxp_x86_release.zip
11572
- name: Set up Visual Studio shell
11673
uses: egor-tensin/vs-shell@v2
11774
- name: Build release
@@ -209,4 +166,33 @@ jobs:
209166
with:
210167
tag_name: ${{ needs.get_time_build.outputs.release_tag }}
211168
files: |
212-
build/newbspguy_win7_x64_gcc_release.zip
169+
build/newbspguy_win7_x64_gcc_release.zip
170+
window_xp_build:
171+
name: Windows XP
172+
needs: get_time_build
173+
runs-on: windows-2019
174+
env:
175+
solution: vs-project/bspguy.sln
176+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
177+
steps:
178+
- name: Checkout
179+
uses: actions/checkout@v2
180+
with:
181+
fetch-depth: 0
182+
submodules: true
183+
- name: Set up Visual Studio shell
184+
uses: egor-tensin/vs-shell@v2
185+
with:
186+
arch: Win32
187+
- name: Build XP
188+
run: |
189+
msbuild ${{ env.solution }} -m /p:Configuration=ReleaseXP_git /p:Platform=Win32
190+
- name: Create Windows release WinXP archive
191+
run: >
192+
mkdir -p build\win32_release
193+
194+
cp vs-project\Release\bspguy.exe build\win32_release\
195+
196+
xcopy /I /E /Y "resources\*" "build\win32_release\"
197+
198+
Compress-Archive -Path "build\win32_release\*" -DestinationPath "build\newbspguy_winxp_x86_release.zip"

‎ascript/angelscript/projects/msvc2022/angelscript.vcxproj

+154
Large diffs are not rendered by default.

‎src/bsp/Bsp.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -7952,7 +7952,9 @@ bool Bsp::import_textures_to_wad(const std::string& wadpath, const std::string&
79527952

79537953
std::vector<std::string> files{};
79547954

7955-
for (auto& dir_entry : std::filesystem::directory_iterator(texpath))
7955+
std::error_code err{};
7956+
7957+
for (auto& dir_entry : std::filesystem::directory_iterator(texpath,err))
79567958
{
79577959
if (!dir_entry.is_directory() && ends_with(toLowerCase(dir_entry.path().string()), ".png"))
79587960
{

‎src/editor/Gui.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -9039,8 +9039,9 @@ void Gui::loadFonts()
90399039
FlushConsoleLog(true);
90409040
return;
90419041
}
9042+
std::error_code err{};
90429043

9043-
for (const auto& entry : fs::directory_iterator(fontPath)) {
9044+
for (const auto& entry : fs::directory_iterator(fontPath,err)) {
90449045
if (entry.is_regular_file()) {
90459046
auto extension = entry.path().extension().string();
90469047
extension = toLowerCase(extension);

‎src/util/util.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -3077,7 +3077,8 @@ int GetEntsAdded(LumpState& oldLump, LumpState& newLump, const std::string& bsp_
30773077

30783078
void findFilesWithExtension(const fs::path& rootPath, const std::string& extension, std::vector<std::string>& fileList, bool relative)
30793079
{
3080-
for (const auto& entry : fs::recursive_directory_iterator(rootPath))
3080+
std::error_code err{};
3081+
for (const auto& entry : fs::recursive_directory_iterator(rootPath,err))
30813082
{
30823083
if (entry.is_regular_file() && entry.path().extension() == extension)
30833084
{
@@ -3088,11 +3089,12 @@ void findFilesWithExtension(const fs::path& rootPath, const std::string& extensi
30883089

30893090
void findDirsWithHasFileExtension(const fs::path& rootPath, const std::string& extension, std::vector<std::string>& dirList, bool relative)
30903091
{
3091-
for (const auto& entry : fs::recursive_directory_iterator(rootPath))
3092+
std::error_code err{};
3093+
for (const auto& entry : fs::recursive_directory_iterator(rootPath,err))
30923094
{
30933095
if (entry.is_directory())
30943096
{
3095-
for (const auto& subEntry : fs::directory_iterator(entry))
3097+
for (const auto& subEntry : fs::directory_iterator(entry,err))
30963098
{
30973099
if (subEntry.is_regular_file() && subEntry.path().extension() == extension)
30983100
{

‎vs-project/bspguy.sln

+18
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Global
2626
Release|x64 = Release|x64
2727
ReleaseXPx86|Win32 = ReleaseXPx86|Win32
2828
ReleaseXPx86|x64 = ReleaseXPx86|x64
29+
ReleasXP_git|Win32 = ReleasXP_git|Win32
30+
ReleasXP_git|x64 = ReleasXP_git|x64
2931
EndGlobalSection
3032
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3133
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -44,6 +46,10 @@ Global
4446
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32
4547
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64
4648
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64
49+
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|Win32
50+
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|Win32
51+
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64
52+
{B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64
4753
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.Debug|Win32.ActiveCfg = Debug|Win32
4854
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.Debug|Win32.Build.0 = Debug|Win32
4955
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.Debug|x64.ActiveCfg = Debug|x64
@@ -60,6 +66,10 @@ Global
6066
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32
6167
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64
6268
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64
69+
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|Win32
70+
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|Win32
71+
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64
72+
{94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64
6373
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.Debug|Win32.ActiveCfg = Debug|Win32
6474
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.Debug|Win32.Build.0 = Debug|Win32
6575
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.Debug|x64.ActiveCfg = Debug|x64
@@ -76,6 +86,10 @@ Global
7686
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32
7787
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64
7888
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64
89+
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|Win32
90+
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|Win32
91+
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64
92+
{FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64
7993
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.Debug|Win32.ActiveCfg = Debug|Win32
8094
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.Debug|Win32.Build.0 = Debug|Win32
8195
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.Debug|x64.ActiveCfg = Debug|x64
@@ -92,6 +106,10 @@ Global
92106
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32
93107
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64
94108
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64
109+
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|ARM
110+
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|ARM
111+
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64
112+
{39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64
95113
EndGlobalSection
96114
GlobalSection(SolutionProperties) = preSolution
97115
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)