Skip to content

Commit 4f7ead4

Browse files
pbatardpbatard
committed
Update build script to remove deprecated calls
* Also update Visual Studio solution files for VS2022 * Also fix Coverity build * Also fix readme build badge per badges/shields#8736.
1 parent 09028de commit 4f7ead4

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

‎.github/workflows/coverity.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ jobs:
3636
uses: microsoft/setup-msbuild@v1
3737

3838
- name: Build with Coverity
39-
run: cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }}
39+
run: |
40+
cov-configure --msvc
41+
cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }}
4042
4143
- name: Upload Coverity build for analysis
4244
run: |

‎.github/workflows/linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939

4040
- name: Set version
4141
id: set_version
42-
run: echo "::set-output name=version::$(git describe --tags)"
42+
# NB: The following only works if the shell is bash
43+
run: echo "version=$(git describe --tags)" >> $GITHUB_OUTPUT
4344

4445
- name: Create version.h file
4546
run: |
@@ -78,7 +79,6 @@ jobs:
7879
- name: Create release
7980
uses: softprops/action-gh-release@v1
8081
if: startsWith(github.ref, 'refs/tags/')
81-
env:
82-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
8382
with:
83+
token: ${{secrets.GITHUB_TOKEN}}
8484
files: ./*.efi

‎.vs/gnu-efi.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,55 +46,55 @@
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>true</UseDebugLibraries>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
<CharacterSet>Unicode</CharacterSet>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5353
<ConfigurationType>StaticLibrary</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v142</PlatformToolset>
55+
<PlatformToolset>v143</PlatformToolset>
5656
<CharacterSet>Unicode</CharacterSet>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
5959
<ConfigurationType>StaticLibrary</ConfigurationType>
6060
<UseDebugLibraries>true</UseDebugLibraries>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
<CharacterSet>Unicode</CharacterSet>
6363
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6666
<ConfigurationType>StaticLibrary</ConfigurationType>
6767
<UseDebugLibraries>true</UseDebugLibraries>
68-
<PlatformToolset>v142</PlatformToolset>
68+
<PlatformToolset>v143</PlatformToolset>
6969
<CharacterSet>Unicode</CharacterSet>
7070
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7373
<ConfigurationType>StaticLibrary</ConfigurationType>
7474
<UseDebugLibraries>false</UseDebugLibraries>
75-
<PlatformToolset>v142</PlatformToolset>
75+
<PlatformToolset>v143</PlatformToolset>
7676
<WholeProgramOptimization>true</WholeProgramOptimization>
7777
<CharacterSet>Unicode</CharacterSet>
7878
</PropertyGroup>
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8080
<ConfigurationType>StaticLibrary</ConfigurationType>
8181
<UseDebugLibraries>false</UseDebugLibraries>
82-
<PlatformToolset>v142</PlatformToolset>
82+
<PlatformToolset>v143</PlatformToolset>
8383
<WholeProgramOptimization>true</WholeProgramOptimization>
8484
<CharacterSet>Unicode</CharacterSet>
8585
</PropertyGroup>
8686
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
8787
<ConfigurationType>StaticLibrary</ConfigurationType>
8888
<UseDebugLibraries>false</UseDebugLibraries>
89-
<PlatformToolset>v142</PlatformToolset>
89+
<PlatformToolset>v143</PlatformToolset>
9090
<WholeProgramOptimization>true</WholeProgramOptimization>
9191
<CharacterSet>Unicode</CharacterSet>
9292
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
9393
</PropertyGroup>
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
9595
<ConfigurationType>StaticLibrary</ConfigurationType>
9696
<UseDebugLibraries>false</UseDebugLibraries>
97-
<PlatformToolset>v142</PlatformToolset>
97+
<PlatformToolset>v143</PlatformToolset>
9898
<WholeProgramOptimization>true</WholeProgramOptimization>
9999
<CharacterSet>Unicode</CharacterSet>
100100
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>

‎.vs/uefi-ntfs.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,52 +46,52 @@
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>true</UseDebugLibraries>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
<CharacterSet>Unicode</CharacterSet>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5353
<ConfigurationType>Application</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v142</PlatformToolset>
55+
<PlatformToolset>v143</PlatformToolset>
5656
<CharacterSet>Unicode</CharacterSet>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
5959
<ConfigurationType>Application</ConfigurationType>
6060
<UseDebugLibraries>true</UseDebugLibraries>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
<CharacterSet>Unicode</CharacterSet>
6363
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6666
<ConfigurationType>Application</ConfigurationType>
6767
<UseDebugLibraries>true</UseDebugLibraries>
68-
<PlatformToolset>v142</PlatformToolset>
68+
<PlatformToolset>v143</PlatformToolset>
6969
<CharacterSet>Unicode</CharacterSet>
7070
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7373
<ConfigurationType>Application</ConfigurationType>
7474
<UseDebugLibraries>false</UseDebugLibraries>
75-
<PlatformToolset>v142</PlatformToolset>
75+
<PlatformToolset>v143</PlatformToolset>
7676
<CharacterSet>Unicode</CharacterSet>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7979
<ConfigurationType>Application</ConfigurationType>
8080
<UseDebugLibraries>false</UseDebugLibraries>
81-
<PlatformToolset>v142</PlatformToolset>
81+
<PlatformToolset>v143</PlatformToolset>
8282
<CharacterSet>Unicode</CharacterSet>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
8585
<ConfigurationType>Application</ConfigurationType>
8686
<UseDebugLibraries>false</UseDebugLibraries>
87-
<PlatformToolset>v142</PlatformToolset>
87+
<PlatformToolset>v143</PlatformToolset>
8888
<CharacterSet>Unicode</CharacterSet>
8989
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
9292
<ConfigurationType>Application</ConfigurationType>
9393
<UseDebugLibraries>false</UseDebugLibraries>
94-
<PlatformToolset>v142</PlatformToolset>
94+
<PlatformToolset>v143</PlatformToolset>
9595
<CharacterSet>Unicode</CharacterSet>
9696
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
9797
</PropertyGroup>

‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build status](https://img.shields.io/github/workflow/status/pbatard/uefi-ntfs/Windows%20%28MSVC%20with%20gnu-efi%29%20build.svg?style=flat-square)](https://github.com/pbatard/uefi-ntfs/actions)
1+
[![Build status](https://img.shields.io/github/actions/workflow/status/pbatard/uefi-ntfs/windows.yml?style=flat-square)](https://github.com/pbatard/uefi-ntfs/actions)
22
[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/23361.svg?style=flat-square)](https://scan.coverity.com/projects/pbatard-uefi-ntfs)
33
[![Licence](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-2.0.en.html)
44

@@ -72,7 +72,7 @@ The way UEFI:NTFS works, in conjunction with Rufus, is as follows:
7272

7373
## Prerequisites
7474

75-
* [Visual Studio 2019](https://www.visualstudio.com/vs/community/) or
75+
* [Visual Studio 2022](https://www.visualstudio.com/vs/community/) or
7676
[MinGW](http://www.mingw.org/)/[MinGW64](http://mingw-w64.sourceforge.net/)
7777
(preferably installed using [msys2](https://sourceforge.net/projects/msys2/))
7878
or gcc
@@ -102,7 +102,7 @@ You can also debug through QEMU by specifying `qemu` to your `make` invocation.
102102
Be mindful however that this turns the special `_DEBUG` mode on, and you should
103103
run make without invoking `qemu` to produce proper release binaries.
104104

105-
* If using VS2019 with EDK2 on Windows, assuming that your EDK2 directory is in
105+
* If using VS2022 with EDK2 on Windows, assuming that your EDK2 directory is in
106106
`D:\edk2` and that `nasm` resides in `D:\edk2\BaseTools\Bin\Win32\`, you should
107107
be able to issue:
108108

@@ -111,7 +111,7 @@ be able to issue:
111111
set WORKSPACE=%CD%
112112
set PACKAGES_PATH=%WORKSPACE%;%EDK2_PATH%
113113
%EDK2_PATH%\edksetup.bat reconfig
114-
build -a X64 -b RELEASE -t VS2019 -p uefi-ntfs.dsc
114+
build -a X64 -b RELEASE -t VS2022 -p uefi-ntfs.dsc
115115

116116
* If using gcc with EDK2 on Linux, and assuming that your edk2 directory resides
117117
in `/usr/src/edk2`:
@@ -133,10 +133,10 @@ If you create a partition of the same size at the end of your drive and copy
133133
there (in DD mode of course), then you should have everything you need to make
134134
the first NTFS partition on that drive UEFI bootable.
135135

136-
## Visual Studio 2019 and ARM/ARM64 support
136+
## Visual Studio 2022 and ARM/ARM64 support
137137

138138
Please be mindful that, to enable ARM or ARM64 compilation support in Visual Studio
139-
2019, you __MUST__ go to the _Individual components_ screen in the setup application
139+
2022, you __MUST__ go to the _Individual components_ screen in the setup application
140140
and select the ARM/ARM64 build tools there, as they do __NOT__ appear in the default
141141
_Workloads_ screen:
142142

0 commit comments

Comments
 (0)