lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Rename VS2010 directory to VS2013 and update Makefiles etc

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman
2023-01-10 15:08:30 +00:00
parent 6b4cb63aed
commit 378ecdd859
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
3rdparty/everest/include/everest/vs2010/Hacl_Curve25519.h → 3rdparty/everest/include/everest/vs2013/Hacl_Curve25519.h vendored
View File

0
3rdparty/everest/include/everest/vs2010/inttypes.h → 3rdparty/everest/include/everest/vs2013/inttypes.h vendored
View File

0
3rdparty/everest/include/everest/vs2010/stdbool.h → 3rdparty/everest/include/everest/vs2013/stdbool.h vendored
View File

14
Makefile
View File

@ -37,7 +37,7 @@ generated_files: tests/generated_files
generated_files: visualc_files generated_files: visualc_files
.PHONY: visualc_files .PHONY: visualc_files
VISUALC_FILES = visualc/VS2010/mbedTLS.sln visualc/VS2010/mbedTLS.vcxproj VISUALC_FILES = visualc/VS2013/mbedTLS.sln visualc/VS2013/mbedTLS.vcxproj
# TODO: $(app).vcxproj for each $(app) in programs/ # TODO: $(app).vcxproj for each $(app) in programs/
visualc_files: $(VISUALC_FILES) visualc_files: $(VISUALC_FILES)
@ -46,9 +46,9 @@ visualc_files: $(VISUALC_FILES)
# they just need to be present. # they just need to be present.
$(VISUALC_FILES): | library/generated_files $(VISUALC_FILES): | library/generated_files
$(VISUALC_FILES): scripts/generate_visualc_files.pl $(VISUALC_FILES): scripts/generate_visualc_files.pl
$(VISUALC_FILES): scripts/data_files/vs2010-app-template.vcxproj $(VISUALC_FILES): scripts/data_files/vs2013-app-template.vcxproj
$(VISUALC_FILES): scripts/data_files/vs2010-main-template.vcxproj $(VISUALC_FILES): scripts/data_files/vs2013-main-template.vcxproj
$(VISUALC_FILES): scripts/data_files/vs2010-sln-template.sln $(VISUALC_FILES): scripts/data_files/vs2013-sln-template.sln
# TODO: also the list of .c and .h source files, but not their content # TODO: also the list of .c and .h source files, but not their content
$(VISUALC_FILES): $(VISUALC_FILES):
echo " Gen $@ ..." echo " Gen $@ ..."
@ -124,10 +124,10 @@ neat: clean_more_on_top
$(MAKE) -C programs neat $(MAKE) -C programs neat
$(MAKE) -C tests neat $(MAKE) -C tests neat
ifndef WINDOWS ifndef WINDOWS
rm -f visualc/VS2010/*.vcxproj visualc/VS2010/mbedTLS.sln rm -f visualc/VS2013/*.vcxproj visualc/VS2013/mbedTLS.sln
else else
if exist visualc\VS2010\*.vcxproj del /Q /F visualc\VS2010\*.vcxproj if exist visualc\VS2013\*.vcxproj del /Q /F visualc\VS2013\*.vcxproj
if exist visualc\VS2010\mbedTLS.sln del /Q /F visualc\VS2010\mbedTLS.sln if exist visualc\VS2013\mbedTLS.sln del /Q /F visualc\VS2013\mbedTLS.sln
endif endif
check: lib tests check: lib tests

0
scripts/data_files/vs2010-app-template.vcxproj → scripts/data_files/vs2013-app-template.vcxproj
View File

0
scripts/data_files/vs2010-main-template.vcxproj → scripts/data_files/vs2013-main-template.vcxproj
View File

0
scripts/data_files/vs2010-sln-template.sln → scripts/data_files/vs2013-sln-template.sln
View File

10
scripts/generate_visualc_files.pl
View File

@ -25,12 +25,12 @@ use warnings;
use strict; use strict;
use Digest::MD5 'md5_hex'; use Digest::MD5 'md5_hex';
my $vsx_dir = "visualc/VS2010"; my $vsx_dir = "visualc/VS2013";
my $vsx_ext = "vcxproj"; my $vsx_ext = "vcxproj";
my $vsx_app_tpl_file = "scripts/data_files/vs2010-app-template.$vsx_ext"; my $vsx_app_tpl_file = "scripts/data_files/vs2013-app-template.$vsx_ext";
my $vsx_main_tpl_file = "scripts/data_files/vs2010-main-template.$vsx_ext"; my $vsx_main_tpl_file = "scripts/data_files/vs2013-main-template.$vsx_ext";
my $vsx_main_file = "$vsx_dir/mbedTLS.$vsx_ext"; my $vsx_main_file = "$vsx_dir/mbedTLS.$vsx_ext";
my $vsx_sln_tpl_file = "scripts/data_files/vs2010-sln-template.sln"; my $vsx_sln_tpl_file = "scripts/data_files/vs2013-sln-template.sln";
my $vsx_sln_file = "$vsx_dir/mbedTLS.sln"; my $vsx_sln_file = "$vsx_dir/mbedTLS.sln";
my $programs_dir = 'programs'; my $programs_dir = 'programs';
@ -58,7 +58,7 @@ my @include_directories = qw(
include include
3rdparty/everest/include/ 3rdparty/everest/include/
3rdparty/everest/include/everest 3rdparty/everest/include/everest
3rdparty/everest/include/everest/vs2010 3rdparty/everest/include/everest/vs2013
3rdparty/everest/include/everest/kremlib 3rdparty/everest/include/everest/kremlib
tests/include tests/include
); );

2
scripts/windows_msbuild.bat
View File

@ -14,7 +14,7 @@ if not "%~1"=="" set "retarget=,PlatformToolset=%1"
@rem vcvarsall.bat will silently change the directory to that directory. @rem vcvarsall.bat will silently change the directory to that directory.
@rem Setting the VSCMD_START_DIR environment variable causes it to change @rem Setting the VSCMD_START_DIR environment variable causes it to change
@rem to that directory instead. @rem to that directory instead.
set "VSCMD_START_DIR=%~dp0\..\visualc\VS2010" set "VSCMD_START_DIR=%~dp0\..\visualc\VS2013"
"%vcvarsall%" x64 && ^ "%vcvarsall%" x64 && ^
msbuild /t:Rebuild /p:Configuration=%cfg%%retarget% /m mbedTLS.sln msbuild /t:Rebuild /p:Configuration=%cfg%%retarget% /m mbedTLS.sln

2
tests/scripts/check-generated-files.sh
View File

@ -134,7 +134,7 @@ check scripts/generate_ssl_debug_helpers.py library/ssl_debug_helpers_generated.
# generate_visualc_files enumerates source files (library/*.c). It doesn't # 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 # care about their content, but the files must exist. So it must run after
# the step that creates or updates these files. # the step that creates or updates these files.
check scripts/generate_visualc_files.pl visualc/VS2010 check scripts/generate_visualc_files.pl visualc/VS2013
check scripts/generate_psa_constants.py programs/psa/psa_constant_names_generated.c check scripts/generate_psa_constants.py programs/psa/psa_constant_names_generated.c
check tests/scripts/generate_bignum_tests.py $(tests/scripts/generate_bignum_tests.py --list) check tests/scripts/generate_bignum_tests.py $(tests/scripts/generate_bignum_tests.py --list)
check tests/scripts/generate_psa_tests.py $(tests/scripts/generate_psa_tests.py --list) check tests/scripts/generate_psa_tests.py $(tests/scripts/generate_psa_tests.py --list)

0
visualc/VS2010/.gitignore → visualc/VS2013/.gitignore vendored
View File