diff options
author | Bence Szépkúti <bence.szepkuti@arm.com> | 2024-03-15 12:56:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-15 12:56:21 +0000 |
commit | 567591eec71e4ba1dce7281e0bdbe99c37a55a4a (patch) | |
tree | 92d9e6f95dd7eb44a27f08d3ed59e98c857b6b58 | |
parent | 0edef1cf6dcc3c307265176aaea2893d93101eaa (diff) | |
parent | e05b54229f8fdffd7adab806790dd8a0b3486bbe (diff) | |
download | mbedtls-567591eec71e4ba1dce7281e0bdbe99c37a55a4a.zip mbedtls-567591eec71e4ba1dce7281e0bdbe99c37a55a4a.tar.gz mbedtls-567591eec71e4ba1dce7281e0bdbe99c37a55a4a.tar.bz2 |
Merge pull request #8923 from bensze01/drop-old-compilers
Drop Support for MSVC 2013, 2015 and Arm Compiler 5
-rw-r--r-- | ChangeLog.d/drop-msvc-2015-and-armcc-5.txt | 5 | ||||
-rw-r--r-- | Makefile | 14 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | include/mbedtls/mbedtls_config.h | 2 | ||||
-rw-r--r-- | scripts/data_files/vs2017-app-template.vcxproj (renamed from scripts/data_files/vs2013-app-template.vcxproj) | 6 | ||||
-rw-r--r-- | scripts/data_files/vs2017-main-template.vcxproj (renamed from scripts/data_files/vs2013-main-template.vcxproj) | 6 | ||||
-rw-r--r-- | scripts/data_files/vs2017-sln-template.sln (renamed from scripts/data_files/vs2013-sln-template.sln) | 6 | ||||
-rwxr-xr-x | scripts/generate_visualc_files.pl | 10 | ||||
-rw-r--r-- | scripts/windows_msbuild.bat | 2 | ||||
-rwxr-xr-x | tests/scripts/check-generated-files.sh | 2 | ||||
-rw-r--r-- | visualc/VS2017/.gitignore (renamed from visualc/VS2013/.gitignore) | 0 |
11 files changed, 36 insertions, 23 deletions
diff --git a/ChangeLog.d/drop-msvc-2015-and-armcc-5.txt b/ChangeLog.d/drop-msvc-2015-and-armcc-5.txt new file mode 100644 index 0000000..435cc98 --- /dev/null +++ b/ChangeLog.d/drop-msvc-2015-and-armcc-5.txt @@ -0,0 +1,5 @@ +Requirement changes + * Drop support for Visual Studio 2013 and 2015, and Arm Compiler 5. +Changes + * Rename directory containing Visual Studio files from visualc/VS2013 to + visualc/VS2017. @@ -74,7 +74,7 @@ gen_file_dep = | endif .PHONY: visualc_files -VISUALC_FILES = visualc/VS2013/mbedTLS.sln visualc/VS2013/mbedTLS.vcxproj +VISUALC_FILES = visualc/VS2017/mbedTLS.sln visualc/VS2017/mbedTLS.vcxproj # TODO: $(app).vcxproj for each $(app) in programs/ visualc_files: $(VISUALC_FILES) @@ -83,9 +83,9 @@ visualc_files: $(VISUALC_FILES) # they just need to be present. $(VISUALC_FILES): | library/generated_files $(VISUALC_FILES): $(gen_file_dep) scripts/generate_visualc_files.pl -$(VISUALC_FILES): $(gen_file_dep) scripts/data_files/vs2013-app-template.vcxproj -$(VISUALC_FILES): $(gen_file_dep) scripts/data_files/vs2013-main-template.vcxproj -$(VISUALC_FILES): $(gen_file_dep) scripts/data_files/vs2013-sln-template.sln +$(VISUALC_FILES): $(gen_file_dep) scripts/data_files/vs2017-app-template.vcxproj +$(VISUALC_FILES): $(gen_file_dep) scripts/data_files/vs2017-main-template.vcxproj +$(VISUALC_FILES): $(gen_file_dep) scripts/data_files/vs2017-sln-template.sln # TODO: also the list of .c and .h source files, but not their content $(VISUALC_FILES): echo " Gen $@ ..." @@ -161,10 +161,10 @@ neat: clean_more_on_top $(MAKE) -C programs neat $(MAKE) -C tests neat ifndef WINDOWS - rm -f visualc/VS2013/*.vcxproj visualc/VS2013/mbedTLS.sln + rm -f visualc/VS2017/*.vcxproj visualc/VS2017/mbedTLS.sln else - if exist visualc\VS2013\*.vcxproj del /Q /F visualc\VS2013\*.vcxproj - if exist visualc\VS2013\mbedTLS.sln del /Q /F visualc\VS2013\mbedTLS.sln + if exist visualc\VS2017\*.vcxproj del /Q /F visualc\VS2017\*.vcxproj + if exist visualc\VS2017\mbedTLS.sln del /Q /F visualc\VS2017\mbedTLS.sln endif check: lib tests @@ -47,11 +47,11 @@ The Make and CMake build systems create three libraries: libmbedcrypto, libmbedx You need the following tools to build the library with the provided makefiles: * GNU Make 3.82 or a build tool that CMake supports. -* A C99 toolchain (compiler, linker, archiver). We actively test with GCC 5.4, Clang 3.8, IAR 8 and Visual Studio 2013. More recent versions should work. Slightly older versions may work. +* A C99 toolchain (compiler, linker, archiver). We actively test with GCC 5.4, Clang 3.8, Arm Compiler 6, IAR 8 and Visual Studio 2017. More recent versions should work. Slightly older versions may work. * Python 3.8 to generate the test code. Python is also needed to integrate PSA drivers and to build the development branch (see next section). * Perl to run the tests, and to generate some source files in the development branch. * CMake 3.10.2 or later (if using CMake). -* Microsoft Visual Studio 2013 or later (if using Visual Studio). +* Microsoft Visual Studio 2017 or later (if using Visual Studio). * Doxygen 1.8.11 or later (if building the documentation; slightly older versions should work). ### Git usage @@ -225,7 +225,7 @@ subproject. ### Microsoft Visual Studio -The build files for Microsoft Visual Studio are generated for Visual Studio 2013. +The build files for Microsoft Visual Studio are generated for Visual Studio 2017. The solution file `mbedTLS.sln` contains all the basic projects needed to build the library and all the programs. The files in tests are not generated and compiled, as these need Python and perl environments as well. However, the selftest program in `programs/test/` is still available. diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index feb2054..5f550c8 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -2211,7 +2211,7 @@ * Enable AES-NI support on x86-64 or x86-32. * * \note AESNI is only supported with certain compilers and target options: - * - Visual Studio 2013: supported. + * - Visual Studio: supported * - GCC, x86-64, target not explicitly supporting AESNI: * requires MBEDTLS_HAVE_ASM. * - GCC, x86-32, target not explicitly supporting AESNI: diff --git a/scripts/data_files/vs2013-app-template.vcxproj b/scripts/data_files/vs2017-app-template.vcxproj index 2fe9cf3..36ca317 100644 --- a/scripts/data_files/vs2013-app-template.vcxproj +++ b/scripts/data_files/vs2017-app-template.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -37,23 +37,27 @@ <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/scripts/data_files/vs2013-main-template.vcxproj b/scripts/data_files/vs2017-main-template.vcxproj index 51861e1..448f9cd 100644 --- a/scripts/data_files/vs2013-main-template.vcxproj +++ b/scripts/data_files/vs2017-main-template.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,23 +28,27 @@ <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/scripts/data_files/vs2013-sln-template.sln b/scripts/data_files/vs2017-sln-template.sln index 615ce04..80efb10 100644 --- a/scripts/data_files/vs2013-sln-template.sln +++ b/scripts/data_files/vs2017-sln-template.sln @@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2017
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 15.0.26228.4
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbedTLS", "mbedTLS.vcxproj", "{46CF2D25-6A36-4189-B59C-E4815388E554}"
EndProject
APP_ENTRIES
diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 96ade2f..a0dfc57 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # Generate main file, individual apps and solution files for -# MS Visual Studio 2013 +# MS Visual Studio 2017 # # Must be run from Mbed TLS root or scripts directory. # Takes no argument. @@ -13,12 +13,12 @@ use warnings; use strict; use Digest::MD5 'md5_hex'; -my $vsx_dir = "visualc/VS2013"; +my $vsx_dir = "visualc/VS2017"; my $vsx_ext = "vcxproj"; -my $vsx_app_tpl_file = "scripts/data_files/vs2013-app-template.$vsx_ext"; -my $vsx_main_tpl_file = "scripts/data_files/vs2013-main-template.$vsx_ext"; +my $vsx_app_tpl_file = "scripts/data_files/vs2017-app-template.$vsx_ext"; +my $vsx_main_tpl_file = "scripts/data_files/vs2017-main-template.$vsx_ext"; my $vsx_main_file = "$vsx_dir/mbedTLS.$vsx_ext"; -my $vsx_sln_tpl_file = "scripts/data_files/vs2013-sln-template.sln"; +my $vsx_sln_tpl_file = "scripts/data_files/vs2017-sln-template.sln"; my $vsx_sln_file = "$vsx_dir/mbedTLS.sln"; my $programs_dir = 'programs'; diff --git a/scripts/windows_msbuild.bat b/scripts/windows_msbuild.bat index ff2b9f2..2bc6a51 100644 --- a/scripts/windows_msbuild.bat +++ b/scripts/windows_msbuild.bat @@ -14,7 +14,7 @@ if not "%~1"=="" set "retarget=,PlatformToolset=%1" @rem vcvarsall.bat will silently change the directory to that directory.
@rem Setting the VSCMD_START_DIR environment variable causes it to change
@rem to that directory instead.
-set "VSCMD_START_DIR=%~dp0\..\visualc\VS2013"
+set "VSCMD_START_DIR=%~dp0\..\visualc\VS2017"
"%vcvarsall%" x64 && ^
msbuild /t:Rebuild /p:Configuration=%cfg%%retarget% /m mbedTLS.sln
diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh index 3fe4e8c..792885f 100755 --- a/tests/scripts/check-generated-files.sh +++ b/tests/scripts/check-generated-files.sh @@ -142,5 +142,5 @@ if in_mbedtls_repo; then # generate_visualc_files enumerates source files (library/*.c). It doesn't # care about their content, but the files must exist. So it must run after # the step that creates or updates these files. - check scripts/generate_visualc_files.pl visualc/VS2013 + check scripts/generate_visualc_files.pl visualc/VS2017 fi diff --git a/visualc/VS2013/.gitignore b/visualc/VS2017/.gitignore index a9ded4a..a9ded4a 100644 --- a/visualc/VS2013/.gitignore +++ b/visualc/VS2017/.gitignore |