From c260954b52101c0f74d4ac808751a296e4f2057f Mon Sep 17 00:00:00 2001
From: Karel Miko <karel.miko@gmail.com>
Date: Tue, 7 Mar 2017 23:56:29 +0100
Subject: [PATCH] ordering file list whe generating msvc.proj

---
 helper.pl                 |   7 +-
 libtomcrypt_VS2005.vcproj | 216 +++++++++++++++++++-------------------
 libtomcrypt_VS2008.vcproj | 216 +++++++++++++++++++-------------------
 3 files changed, 219 insertions(+), 220 deletions(-)

diff --git a/helper.pl b/helper.pl
index a1d8c375..58cd71e6 100755
--- a/helper.pl
+++ b/helper.pl
@@ -75,12 +75,11 @@ sub prepare_msvc_files_xml {
   my $last = [];
   my $depth = 2;
   my $files = "<Files>\r\n";
-  for my $full (@$all) {
+  for my $full (sort @$all) {
     my @items = split /\//, $full; # split by '/'
     $full =~ s|/|\\|g;             # replace '/' bt '\'
-    #XXXXXXXXXXXXX
-    shift @items;
-    pop @items; # drop last one
+    shift @items; # drop first one (src)
+    pop @items;   # drop last one (filename.ext)
     my $current = \@items;
     if (join(':', @$current) ne join(':', @$last)) {
       my $common = 0;
diff --git a/libtomcrypt_VS2005.vcproj b/libtomcrypt_VS2005.vcproj
index 57281459..b4e38051 100644
--- a/libtomcrypt_VS2005.vcproj
+++ b/libtomcrypt_VS2005.vcproj
@@ -170,6 +170,38 @@
 		<Filter
 			Name="ciphers"
 			>
+			<Filter
+				Name="aes"
+				>
+				<File
+					RelativePath="src\ciphers\aes\aes.c"
+					>
+				</File>
+				<File
+					RelativePath="src\ciphers\aes\aes_tab.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 			<File
 				RelativePath="src\ciphers\anubis.c"
 				>
@@ -222,46 +254,6 @@
 				RelativePath="src\ciphers\rc6.c"
 				>
 			</File>
-			<File
-				RelativePath="src\ciphers\skipjack.c"
-				>
-			</File>
-			<File
-				RelativePath="src\ciphers\xtea.c"
-				>
-			</File>
-			<Filter
-				Name="aes"
-				>
-				<File
-					RelativePath="src\ciphers\aes\aes.c"
-					>
-				</File>
-				<File
-					RelativePath="src\ciphers\aes\aes_tab.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
 			<Filter
 				Name="safer"
 				>
@@ -269,10 +261,6 @@
 					RelativePath="src\ciphers\safer\safer.c"
 					>
 				</File>
-				<File
-					RelativePath="src\ciphers\safer\saferp.c"
-					>
-				</File>
 				<File
 					RelativePath="src\ciphers\safer\safer_tab.c"
 					>
@@ -297,7 +285,15 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="src\ciphers\safer\saferp.c"
+					>
+				</File>
 			</Filter>
+			<File
+				RelativePath="src\ciphers\skipjack.c"
+				>
+			</File>
 			<Filter
 				Name="twofish"
 				>
@@ -330,6 +326,10 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\ciphers\xtea.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="encauth"
@@ -566,6 +566,34 @@
 		<Filter
 			Name="hashes"
 			>
+			<Filter
+				Name="chc"
+				>
+				<File
+					RelativePath="src\hashes\chc\chc.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="helper"
+				>
+				<File
+					RelativePath="src\hashes\helper\hash_file.c"
+					>
+				</File>
+				<File
+					RelativePath="src\hashes\helper\hash_filehandle.c"
+					>
+				</File>
+				<File
+					RelativePath="src\hashes\helper\hash_memory.c"
+					>
+				</File>
+				<File
+					RelativePath="src\hashes\helper\hash_memory_multi.c"
+					>
+				</File>
+			</Filter>
 			<File
 				RelativePath="src\hashes\md2.c"
 				>
@@ -598,38 +626,6 @@
 				RelativePath="src\hashes\sha1.c"
 				>
 			</File>
-			<File
-				RelativePath="src\hashes\tiger.c"
-				>
-			</File>
-			<Filter
-				Name="chc"
-				>
-				<File
-					RelativePath="src\hashes\chc\chc.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="helper"
-				>
-				<File
-					RelativePath="src\hashes\helper\hash_file.c"
-					>
-				</File>
-				<File
-					RelativePath="src\hashes\helper\hash_filehandle.c"
-					>
-				</File>
-				<File
-					RelativePath="src\hashes\helper\hash_memory.c"
-					>
-				</File>
-				<File
-					RelativePath="src\hashes\helper\hash_memory_multi.c"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="sha2"
 				>
@@ -658,6 +654,10 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\hashes\tiger.c"
+				>
+			</File>
 			<Filter
 				Name="whirl"
 				>
@@ -938,6 +938,14 @@
 		<Filter
 			Name="math"
 			>
+			<Filter
+				Name="fp"
+				>
+				<File
+					RelativePath="src\math\fp\ltc_ecc_fp_mulmod.c"
+					>
+				</File>
+			</Filter>
 			<File
 				RelativePath="src\math\gmp_desc.c"
 				>
@@ -962,14 +970,6 @@
 				RelativePath="src\math\tfm_desc.c"
 				>
 			</File>
-			<Filter
-				Name="fp"
-				>
-				<File
-					RelativePath="src\math\fp\ltc_ecc_fp_mulmod.c"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="misc"
@@ -978,30 +978,6 @@
 				RelativePath="src\misc\adler32.c"
 				>
 			</File>
-			<File
-				RelativePath="src\misc\burn_stack.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\error_to_string.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\mem_neq.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\pk_get_oid.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\zeromem.c"
-				>
-			</File>
 			<Filter
 				Name="base64"
 				>
@@ -1014,6 +990,14 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\burn_stack.c"
+				>
+			</File>
+			<File
+				RelativePath="src\misc\crc32.c"
+				>
+			</File>
 			<Filter
 				Name="crypt"
 				>
@@ -1126,6 +1110,10 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\error_to_string.c"
+				>
+			</File>
 			<Filter
 				Name="hkdf"
 				>
@@ -1138,6 +1126,14 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\mem_neq.c"
+				>
+			</File>
+			<File
+				RelativePath="src\misc\pk_get_oid.c"
+				>
+			</File>
 			<Filter
 				Name="pkcs5"
 				>
@@ -1154,6 +1150,10 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\zeromem.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="modes"
diff --git a/libtomcrypt_VS2008.vcproj b/libtomcrypt_VS2008.vcproj
index 44516278..4a7597b4 100644
--- a/libtomcrypt_VS2008.vcproj
+++ b/libtomcrypt_VS2008.vcproj
@@ -172,6 +172,38 @@
 		<Filter
 			Name="ciphers"
 			>
+			<Filter
+				Name="aes"
+				>
+				<File
+					RelativePath="src\ciphers\aes\aes.c"
+					>
+				</File>
+				<File
+					RelativePath="src\ciphers\aes\aes_tab.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 			<File
 				RelativePath="src\ciphers\anubis.c"
 				>
@@ -224,46 +256,6 @@
 				RelativePath="src\ciphers\rc6.c"
 				>
 			</File>
-			<File
-				RelativePath="src\ciphers\skipjack.c"
-				>
-			</File>
-			<File
-				RelativePath="src\ciphers\xtea.c"
-				>
-			</File>
-			<Filter
-				Name="aes"
-				>
-				<File
-					RelativePath="src\ciphers\aes\aes.c"
-					>
-				</File>
-				<File
-					RelativePath="src\ciphers\aes\aes_tab.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
 			<Filter
 				Name="safer"
 				>
@@ -271,10 +263,6 @@
 					RelativePath="src\ciphers\safer\safer.c"
 					>
 				</File>
-				<File
-					RelativePath="src\ciphers\safer\saferp.c"
-					>
-				</File>
 				<File
 					RelativePath="src\ciphers\safer\safer_tab.c"
 					>
@@ -299,7 +287,15 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="src\ciphers\safer\saferp.c"
+					>
+				</File>
 			</Filter>
+			<File
+				RelativePath="src\ciphers\skipjack.c"
+				>
+			</File>
 			<Filter
 				Name="twofish"
 				>
@@ -332,6 +328,10 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\ciphers\xtea.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="encauth"
@@ -568,6 +568,34 @@
 		<Filter
 			Name="hashes"
 			>
+			<Filter
+				Name="chc"
+				>
+				<File
+					RelativePath="src\hashes\chc\chc.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="helper"
+				>
+				<File
+					RelativePath="src\hashes\helper\hash_file.c"
+					>
+				</File>
+				<File
+					RelativePath="src\hashes\helper\hash_filehandle.c"
+					>
+				</File>
+				<File
+					RelativePath="src\hashes\helper\hash_memory.c"
+					>
+				</File>
+				<File
+					RelativePath="src\hashes\helper\hash_memory_multi.c"
+					>
+				</File>
+			</Filter>
 			<File
 				RelativePath="src\hashes\md2.c"
 				>
@@ -600,38 +628,6 @@
 				RelativePath="src\hashes\sha1.c"
 				>
 			</File>
-			<File
-				RelativePath="src\hashes\tiger.c"
-				>
-			</File>
-			<Filter
-				Name="chc"
-				>
-				<File
-					RelativePath="src\hashes\chc\chc.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="helper"
-				>
-				<File
-					RelativePath="src\hashes\helper\hash_file.c"
-					>
-				</File>
-				<File
-					RelativePath="src\hashes\helper\hash_filehandle.c"
-					>
-				</File>
-				<File
-					RelativePath="src\hashes\helper\hash_memory.c"
-					>
-				</File>
-				<File
-					RelativePath="src\hashes\helper\hash_memory_multi.c"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="sha2"
 				>
@@ -660,6 +656,10 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\hashes\tiger.c"
+				>
+			</File>
 			<Filter
 				Name="whirl"
 				>
@@ -940,6 +940,14 @@
 		<Filter
 			Name="math"
 			>
+			<Filter
+				Name="fp"
+				>
+				<File
+					RelativePath="src\math\fp\ltc_ecc_fp_mulmod.c"
+					>
+				</File>
+			</Filter>
 			<File
 				RelativePath="src\math\gmp_desc.c"
 				>
@@ -964,14 +972,6 @@
 				RelativePath="src\math\tfm_desc.c"
 				>
 			</File>
-			<Filter
-				Name="fp"
-				>
-				<File
-					RelativePath="src\math\fp\ltc_ecc_fp_mulmod.c"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="misc"
@@ -980,30 +980,6 @@
 				RelativePath="src\misc\adler32.c"
 				>
 			</File>
-			<File
-				RelativePath="src\misc\burn_stack.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\error_to_string.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\mem_neq.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\pk_get_oid.c"
-				>
-			</File>
-			<File
-				RelativePath="src\misc\zeromem.c"
-				>
-			</File>
 			<Filter
 				Name="base64"
 				>
@@ -1016,6 +992,14 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\burn_stack.c"
+				>
+			</File>
+			<File
+				RelativePath="src\misc\crc32.c"
+				>
+			</File>
 			<Filter
 				Name="crypt"
 				>
@@ -1128,6 +1112,10 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\error_to_string.c"
+				>
+			</File>
 			<Filter
 				Name="hkdf"
 				>
@@ -1140,6 +1128,14 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\mem_neq.c"
+				>
+			</File>
+			<File
+				RelativePath="src\misc\pk_get_oid.c"
+				>
+			</File>
 			<Filter
 				Name="pkcs5"
 				>
@@ -1156,6 +1152,10 @@
 					>
 				</File>
 			</Filter>
+			<File
+				RelativePath="src\misc\zeromem.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="modes"