Remove the generation of MS visual studio files
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
index 86ed74e..62939e3 100755
--- a/scripts/bump_version.sh
+++ b/scripts/bump_version.sh
@@ -143,6 +143,3 @@
[ $VERBOSE ] && echo "Re-generating library/version_features.c"
scripts/generate_features.pl
-[ $VERBOSE ] && echo "Re-generating visualc files"
-scripts/generate_visualc_files.pl
-
diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl
deleted file mode 100755
index ef684b7..0000000
--- a/scripts/generate_visualc_files.pl
+++ /dev/null
@@ -1,352 +0,0 @@
-#!/usr/bin/env perl
-
-# Generate main file, individual apps and solution files for
-# MS Visual Studio 2017
-#
-# Must be run from Mbed TLS root or scripts directory.
-# Takes no argument.
-#
-# Copyright The Mbed TLS Contributors
-# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
-
-use warnings;
-use strict;
-use Getopt::Long;
-use Digest::MD5 'md5_hex';
-
-# Declare variables for options
-my $vsx_dir = "visualc/VS2017";
-my $list = 0; # Default off
-
-GetOptions(
- "directory=s" => \$vsx_dir, # Target directory
- "list" => \$list # Only list generated files
-) or die "Invalid options\n";
-
-my $vsx_ext = "vcxproj";
-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/vs2017-sln-template.sln";
-my $vsx_sln_file = "$vsx_dir/mbedTLS.sln";
-
-my $mbedtls_programs_dir = "programs";
-my $framework_programs_dir = "framework/tests/programs";
-my $tfpsacrypto_programs_dir = "tf-psa-crypto/programs";
-
-my $mbedtls_header_dir = 'include/mbedtls';
-my $drivers_builtin_header_dir = 'tf-psa-crypto/drivers/builtin/include/mbedtls';
-my $psa_header_dir = 'tf-psa-crypto/include/psa';
-my $tls_source_dir = 'library';
-my $crypto_core_source_dir = 'tf-psa-crypto/core';
-my $crypto_source_dir = 'tf-psa-crypto/drivers/builtin/src';
-my $tls_test_source_dir = 'tests/src';
-my $tls_test_header_dir = 'tests/include/test';
-my $crypto_test_source_dir = 'tf-psa-crypto/tests/src';
-my $crypto_test_header_dir = 'tf-psa-crypto/tests/include/test';
-my $test_source_dir = 'framework/tests/src';
-my $test_header_dir = 'framework/tests/include/test';
-my $test_drivers_header_dir = 'framework/tests/include/test/drivers';
-my $test_drivers_source_dir = 'framework/tests/src/drivers';
-
-my @thirdparty_header_dirs = qw(
- tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest
-);
-my @thirdparty_source_dirs = qw(
- tf-psa-crypto/drivers/everest/library
- tf-psa-crypto/drivers/everest/library/kremlib
- tf-psa-crypto/drivers/everest/library/legacy
-);
-
-# Directories to add to the include path.
-# Order matters in case there are files with the same name in more than
-# one directory: the compiler will use the first match.
-my @include_directories = qw(
- include
- tf-psa-crypto/include
- tf-psa-crypto/drivers/builtin/include
- tf-psa-crypto/drivers/everest/include/
- tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest
- tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013
- tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib
- tests/include
- tf-psa-crypto/tests/include
- framework/tests/include
- framework/tests/programs
-);
-my $include_directories = join(';', map {"../../$_"} @include_directories);
-
-# Directories to add to the include path when building the libraries, but not
-# when building tests or applications.
-my @library_include_directories = qw(
- library
- tf-psa-crypto/core
- tf-psa-crypto/drivers/builtin/src
-);
-my $library_include_directories =
- join(';', map {"../../$_"} (@library_include_directories,
- @include_directories));
-
-my @excluded_files = qw(
- tf-psa-crypto/drivers/everest/library/Hacl_Curve25519.c
-);
-my %excluded_files = ();
-foreach (@excluded_files) { $excluded_files{$_} = 1 }
-
-my $vsx_hdr_tpl = <<EOT;
- <ClInclude Include="..\\..\\{NAME}" />
-EOT
-my $vsx_src_tpl = <<EOT;
- <ClCompile Include="..\\..\\{NAME}" />
-EOT
-
-my $vsx_sln_app_entry_tpl = <<EOT;
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{APPNAME}", "{APPNAME}.vcxproj", "{GUID}"
- ProjectSection(ProjectDependencies) = postProject
- {46CF2D25-6A36-4189-B59C-E4815388E554} = {46CF2D25-6A36-4189-B59C-E4815388E554}
- EndProjectSection
-EndProject
-EOT
-
-my $vsx_sln_conf_entry_tpl = <<EOT;
- {GUID}.Debug|Win32.ActiveCfg = Debug|Win32
- {GUID}.Debug|Win32.Build.0 = Debug|Win32
- {GUID}.Debug|x64.ActiveCfg = Debug|x64
- {GUID}.Debug|x64.Build.0 = Debug|x64
- {GUID}.Release|Win32.ActiveCfg = Release|Win32
- {GUID}.Release|Win32.Build.0 = Release|Win32
- {GUID}.Release|x64.ActiveCfg = Release|x64
- {GUID}.Release|x64.Build.0 = Release|x64
-EOT
-
-exit( main() );
-
-sub check_dirs {
- foreach my $d (@thirdparty_header_dirs, @thirdparty_source_dirs) {
- if (not (-d $d)) { return 0; }
- }
- return -d $vsx_dir
- && -d $mbedtls_header_dir
- && -d $drivers_builtin_header_dir
- && -d $psa_header_dir
- && -d $tls_source_dir
- && -d $crypto_core_source_dir
- && -d $crypto_source_dir
- && -d $test_source_dir
- && -d $tls_test_source_dir
- && -d $crypto_test_source_dir
- && -d $test_drivers_source_dir
- && -d $test_header_dir
- && -d $tls_test_header_dir
- && -d $crypto_test_header_dir
- && -d $test_drivers_header_dir
- && -d $mbedtls_programs_dir
- && -d $framework_programs_dir
- && -d $tfpsacrypto_programs_dir;
-}
-
-sub slurp_file {
- my ($filename) = @_;
-
- local $/ = undef;
- open my $fh, '<:crlf', $filename or die "Could not read $filename\n";
- my $content = <$fh>;
- close $fh;
-
- return $content;
-}
-
-sub content_to_file {
- my ($content, $filename) = @_;
-
- open my $fh, '>:crlf', $filename or die "Could not write to $filename\n";
- print $fh $content;
- close $fh;
-}
-
-sub gen_app_guid {
- my ($path) = @_;
-
- my $guid = md5_hex( "mbedTLS:$path" );
- $guid =~ s/(.{8})(.{4})(.{4})(.{4})(.{12})/\U{$1-$2-$3-$4-$5}/;
-
- return $guid;
-}
-
-sub gen_app {
- my ($path, $template, $dir, $ext) = @_;
-
- my $guid = gen_app_guid( $path );
- $path =~ s!/!\\!g;
- (my $appname = $path) =~ s/.*\\//;
- my $is_test_app = ($path =~ m/^test\\/);
-
- my $srcs;
- if( $appname eq "metatest" or $appname eq "query_compile_time_config" or
- $appname eq "query_included_headers" or $appname eq "zeroize" ) {
- $srcs = "<ClCompile Include=\"..\\..\\framework\\tests\\programs\\$appname.c\" \/>";
- } else {
- $srcs = "<ClCompile Include=\"..\\..\\programs\\$path.c\" \/>";
- }
-
- if( $appname eq "ssl_client2" or $appname eq "ssl_server2" or
- $appname eq "query_compile_time_config" ) {
- $srcs .= "\n <ClCompile Include=\"..\\..\\programs\\test\\query_config.c\" \/>";
- }
- if( $appname eq "ssl_client2" or $appname eq "ssl_server2" ) {
- $srcs .= "\n <ClCompile Include=\"..\\..\\programs\\ssl\\ssl_test_lib.c\" \/>";
- }
-
- my $content = $template;
- $content =~ s/<SOURCES>/$srcs/g;
- $content =~ s/<APPNAME>/$appname/g;
- $content =~ s/<GUID>/$guid/g;
- $content =~ s/INCLUDE_DIRECTORIES\n/($is_test_app ?
- $library_include_directories :
- $include_directories)/ge;
-
- content_to_file( $content, "$dir/$appname.$ext" );
-}
-
-sub get_app_list {
- my $makefile_contents = slurp_file('programs/Makefile');
- $makefile_contents =~ /\n\s*APPS\s*=[\\\s]*(.*?)(?<!\\)[\#\n]/s
- or die "Cannot find APPS = ... in programs/Makefile\n";
- return split /(?:\s|\\)+/, $1;
-}
-
-sub gen_app_files {
- my @app_list = @_;
-
- my $vsx_tpl = slurp_file( $vsx_app_tpl_file );
-
- for my $app ( @app_list ) {
- gen_app( $app, $vsx_tpl, $vsx_dir, $vsx_ext );
- }
-}
-
-sub gen_entry_list {
- my ($tpl, @names) = @_;
-
- my $entries;
- for my $name (@names) {
- (my $entry = $tpl) =~ s/{NAME}/$name/g;
- $entries .= $entry;
- }
-
- return $entries;
-}
-
-sub gen_main_file {
- my ($headers, $sources,
- $hdr_tpl, $src_tpl,
- $main_tpl, $main_out) = @_;
-
- my $header_entries = gen_entry_list( $hdr_tpl, @$headers );
- my $source_entries = gen_entry_list( $src_tpl, @$sources );
-
- my $out = slurp_file( $main_tpl );
- $out =~ s/SOURCE_ENTRIES\n/$source_entries/m;
- $out =~ s/HEADER_ENTRIES\n/$header_entries/m;
- $out =~ s/INCLUDE_DIRECTORIES\n/$library_include_directories/g;
-
- content_to_file( $out, $main_out );
-}
-
-sub gen_vsx_solution {
- my (@app_names) = @_;
-
- my ($app_entries, $conf_entries);
- for my $path (@app_names) {
- my $guid = gen_app_guid( $path );
- (my $appname = $path) =~ s!.*/!!;
-
- my $app_entry = $vsx_sln_app_entry_tpl;
- $app_entry =~ s/{APPNAME}/$appname/g;
- $app_entry =~ s/{GUID}/$guid/g;
-
- $app_entries .= $app_entry;
-
- my $conf_entry = $vsx_sln_conf_entry_tpl;
- $conf_entry =~ s/{GUID}/$guid/g;
-
- $conf_entries .= $conf_entry;
- }
-
- my $out = slurp_file( $vsx_sln_tpl_file );
- $out =~ s/APP_ENTRIES\n/$app_entries/m;
- $out =~ s/CONF_ENTRIES\n/$conf_entries/m;
-
- content_to_file( $out, $vsx_sln_file );
-}
-
-sub del_vsx_files {
- unlink glob "'$vsx_dir/*.$vsx_ext'";
- unlink $vsx_main_file;
- unlink $vsx_sln_file;
-}
-
-sub main {
- if( ! check_dirs() ) {
- chdir '..' or die;
- check_dirs or die "Must be run from Mbed TLS root or scripts dir\n";
- }
-
- # Remove old files to ensure that, for example, project files from deleted
- # apps are not kept
- if (not $list) {
- del_vsx_files();
- }
-
- my @app_list = get_app_list();
- my @header_dirs = (
- $mbedtls_header_dir,
- $drivers_builtin_header_dir,
- $psa_header_dir,
- $test_header_dir,
- $tls_test_header_dir,
- $crypto_test_header_dir,
- $test_drivers_header_dir,
- $tls_source_dir,
- $crypto_core_source_dir,
- $crypto_source_dir,
- $framework_programs_dir,
- @thirdparty_header_dirs,
- );
- my @headers = (map { <$_/*.h> } @header_dirs);
- my @source_dirs = (
- $tls_source_dir,
- $crypto_core_source_dir,
- $crypto_source_dir,
- $test_source_dir,
- $tls_test_source_dir,
- $crypto_test_source_dir,
- $test_drivers_source_dir,
- @thirdparty_source_dirs,
- );
- my @sources = (map { <$_/*.c> } @source_dirs);
-
- @headers = grep { ! $excluded_files{$_} } @headers;
- @sources = grep { ! $excluded_files{$_} } @sources;
- map { s!/!\\!g } @headers;
- map { s!/!\\!g } @sources;
-
- if ($list) {
- foreach my $app (@app_list) {
- $app =~ s/.*\///;
- print "$vsx_dir/$app.$vsx_ext\n";
- }
- print "$vsx_main_file\n";
- print "$vsx_sln_file\n";
- } else {
- gen_app_files( @app_list );
-
- gen_main_file( \@headers, \@sources,
- $vsx_hdr_tpl, $vsx_src_tpl,
- $vsx_main_tpl_file, $vsx_main_file );
-
- gen_vsx_solution( @app_list );
- }
-
- return 0;
-}
diff --git a/scripts/legacy.make b/scripts/legacy.make
index 6706143..9c8585c 100644
--- a/scripts/legacy.make
+++ b/scripts/legacy.make
@@ -62,7 +62,6 @@
generated_files: library/generated_files
generated_files: programs/generated_files
generated_files: tests/generated_files
-generated_files: visualc_files
# Set GEN_FILES to the empty string to disable dependencies on generated
# source files. Then `make generated_files` will only build files that
@@ -87,26 +86,6 @@
gen_file_dep = |
endif
-.PHONY: visualc_files
-VISUALC_FILES = visualc/VS2017/mbedTLS.sln visualc/VS2017/mbedTLS.vcxproj
-# TODO: $(app).vcxproj for each $(app) in programs/
-visualc_files: $(VISUALC_FILES)
-
-# Ensure that the .c files that generate_visualc_files.pl enumerates are
-# present before it runs. It doesn't matter if the files aren't up-to-date,
-# they just need to be present.
-$(VISUALC_FILES): | library/generated_files
-$(VISUALC_FILES): | programs/generated_files
-$(VISUALC_FILES): | tests/generated_files
-$(VISUALC_FILES): $(gen_file_dep) scripts/generate_visualc_files.pl
-$(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 $@ ..."
- $(PERL) scripts/generate_visualc_files.pl
-
ifndef WINDOWS
install: no_test
mkdir -p $(DESTDIR)/include/mbedtls
@@ -159,12 +138,6 @@
$(MAKE) -C library neat
$(MAKE) -C programs neat
$(MAKE) -C tests neat
-ifndef WINDOWS
- rm -f visualc/VS2017/*.vcxproj visualc/VS2017/mbedTLS.sln
-else
- 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
ifndef PSASIM
check: lib
diff --git a/tests/scripts/components-basic-checks.sh b/tests/scripts/components-basic-checks.sh
index 74b3ab3..e791ad0 100644
--- a/tests/scripts/components-basic-checks.sh
+++ b/tests/scripts/components-basic-checks.sh
@@ -39,12 +39,6 @@
make
cd "$MBEDTLS_ROOT_DIR"
- # Files for MS Visual Studio are not generated with cmake thus copy the
- # ones generated with make to pacify make_generated_files.py check.
- # Files for MS Visual Studio are rather on their way out thus not adding
- # support for them with cmake.
- cp -Rf visualc "$OUT_OF_SOURCE_DIR"
-
$FRAMEWORK/scripts/make_generated_files.py --root "$OUT_OF_SOURCE_DIR" --check
cd $TF_PSA_CRYPTO_ROOT_DIR
diff --git a/visualc/VS2017/.gitignore b/visualc/VS2017/.gitignore
deleted file mode 100644
index e45eaf6..0000000
--- a/visualc/VS2017/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# Files that may be left over from make_generated-files.py --check
-/*.bak
-
-# Visual Studio artifacts
-/.localhistory/
-/.vs/
-/Debug/
-/Release/
-/*.vcxproj.filters
-/*.vcxproj.user
-
-###START_GENERATED_FILES###
-# Files automatically generated by generate_visualc_files.pl
-/mbedTLS.sln
-/*.vcxproj
-###END_GENERATED_FILES###