diff --git a/Makefile b/Makefile index 885948c112..0c404bffaa 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,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) @@ -69,9 +69,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 $@ ..." @@ -147,10 +147,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 diff --git a/scripts/data_files/vs2013-app-template.vcxproj b/scripts/data_files/vs2017-app-template.vcxproj similarity index 100% rename from scripts/data_files/vs2013-app-template.vcxproj rename to scripts/data_files/vs2017-app-template.vcxproj diff --git a/scripts/data_files/vs2013-main-template.vcxproj b/scripts/data_files/vs2017-main-template.vcxproj similarity index 100% rename from scripts/data_files/vs2013-main-template.vcxproj rename to scripts/data_files/vs2017-main-template.vcxproj diff --git a/scripts/data_files/vs2013-sln-template.sln b/scripts/data_files/vs2017-sln-template.sln similarity index 100% rename from scripts/data_files/vs2013-sln-template.sln rename to scripts/data_files/vs2017-sln-template.sln diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 96ade2fa76..272337c22d 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -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 ff2b9f2d1c..2bc6a51ce8 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 3fe4e8c63a..792885fdf3 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 similarity index 100% rename from visualc/VS2013/.gitignore rename to visualc/VS2017/.gitignore