Merge pull request #296 from NETMF/revert-295-crypto

Revert "Restored Legacy Crypto support"

Author: mortezag

.gitignore

@@ -30,8 +30,6 @@
 [Oo]bj/
 ipch/
 
-!/tools/bin/
-
 #uVision
 *.uvguix*
 Listings/
@@ -41,4 +39,3 @@ Listings/
 /DeviceCode/Targets/OS/Win32/DeviceCode/WinPcap_Eth/Dependencies/WpdPack/
 
 *.axfdump
-/crypto/lib

crypto/dotNetMF.proj

@@ -52,46 +52,39 @@
     <CryptoStub Condition="'$(PLATFORM_FAMILY)'=='SHC'"     >true</CryptoStub>
     <CryptoStub Condition="'$(COMPILER_TOOL)'  =='GCCOP'"   >true</CryptoStub>
 
-    <!--
-    Force thumb2fp to use the same lib as thumb2 (There's no floating point code in the crypto libs)
-    so this saves replicating the libs into another directory for the instruction set and then again
-    for the tool chain.
-    -->
-    <CryptoInstructionSet Condition="'$(INSTRUCTION_SET)'=='thumb2fp'">thumb2</CryptoInstructionSet>
-    <CryptoInstructionSet Condition="'$(INSTRUCTION_SET)'!='thumb2fp'">$(INSTRUCTION_SET)</CryptoInstructionSet>
     <CustomTargets Condition="'$(CryptoStub)'=='false'">CryptoLib</CustomTargets>
-    <CustomTargets Condition="'$(CryptoInstructionSet)'=='x86'">CryptoLibX86</CustomTargets>
+    <CustomTargets Condition="'$(INSTRUCTION_SET)'=='x86'">CryptoLibX86</CustomTargets>
   </PropertyGroup>
 
 
-  <PropertyGroup Condition="'$(CryptoInstructionSet)'!='x86'">
-    <LibSrc                                                                >lib\$(CryptoInstructionSet)\$(DOTNETMF_COMPILER)\crypto.$(LIB_EXT)</LibSrc>
-    <LibSrc Condition="'$(COMPILER_TOOL)'=='ARM' AND !EXISTS('$(LibSrc)')" >lib\$(CryptoInstructionSet)\RVDS4.0\crypto.$(LIB_EXT)</LibSrc>
-    <LibSrc Condition="'$(COMPILER_TOOL)'=='GCC'"                          >lib\$(CryptoInstructionSet)\RVDS3.1\crypto.$(LIB_EXT)</LibSrc>
-    <LibSrc Condition="'$(COMPILER_TOOL)'=='ARC'"                          >lib\$(CryptoInstructionSet)\MTWR8.0\crypto.$(LIB_EXT)</LibSrc>
+  <PropertyGroup Condition="'$(INSTRUCTION_SET)'!='x86'">
+    <LibSrc                                                                >lib\$(INSTRUCTION_SET)\$(DOTNETMF_COMPILER)\crypto.$(LIB_EXT)</LibSrc>
+    <LibSrc Condition="'$(COMPILER_TOOL)'=='ARM' AND !EXISTS('$(LibSrc)')" >lib\$(INSTRUCTION_SET)\RVDS4.0\crypto.$(LIB_EXT)</LibSrc>
+    <LibSrc Condition="'$(COMPILER_TOOL)'=='GCC'"                          >lib\$(INSTRUCTION_SET)\RVDS3.1\crypto.$(LIB_EXT)</LibSrc>
+    <LibSrc Condition="'$(COMPILER_TOOL)'=='ARC'"                          >lib\$(INSTRUCTION_SET)\MTWR8.0\crypto.$(LIB_EXT)</LibSrc>
     <LibSrc Condition="!EXISTS('$(LibSrc)')"                               >$(LIB_DIR)\crypto_stub.$(LIB_EXT)</LibSrc>
     <LibTo>crypto.$(LIB_EXT)</LibTo>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(CryptoInstructionSet)'=='x86'">
-    <LibFiles Include="lib\$(CryptoInstructionSet)\crypto.lib" Condition="EXISTS('lib\$(CryptoInstructionSet)\crypto.lib')">
+  <ItemGroup Condition="'$(INSTRUCTION_SET)'=='x86'">
+    <LibFiles Include="lib\$(INSTRUCTION_SET)\crypto.lib" Condition="EXISTS('lib\$(INSTRUCTION_SET)\crypto.lib')">
         <DestFile>crypto.lib</DestFile>
     </LibFiles>
-    <LibFiles Include="lib\$(CryptoInstructionSet)\crypto.pdb" Condition="Exists('lib\$(CryptoInstructionSet)\crypto.pdb')">
+    <LibFiles Include="lib\$(INSTRUCTION_SET)\crypto.pdb" Condition="Exists('lib\$(INSTRUCTION_SET)\crypto.pdb')">
         <DestFile>crypto.pdb</DestFile>
     </LibFiles>
-    <LibFiles Include="$(LIB_DIR)\crypto_stub.lib"        Condition="!Exists('lib\$(CryptoInstructionSet)\crypto.lib')">
+    <LibFiles Include="$(LIB_DIR)\crypto_stub.lib"        Condition="!Exists('lib\$(INSTRUCTION_SET)\crypto.lib')">
         <DestFile>crypto.lib</DestFile>
     </LibFiles>
   </ItemGroup>
 
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
 
-  <ItemGroup Condition="'$(CryptoInstructionSet)'!='x86'">
+  <ItemGroup Condition="'$(INSTRUCTION_SET)'!='x86'">
     <ExtraCleanFiles Include="$(LIB_DIR)\$(LibTo)"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(CryptoInstructionSet)'=='x86'">
+  <ItemGroup Condition="'$(INSTRUCTION_SET)'=='x86'">
     <ExtraCleanFiles Include="@(LibFiles -> '$(LIB_DIR)\%(Filename)%(Extension)')" />
   </ItemGroup>
 

setup/Features/Tools.wxs

@@ -11,7 +11,6 @@
       <ComponentRef Id="Component_BuildHelper"/>
       <ComponentRef Id="Component_MFDeploy"/>
       <ComponentRef Id="Component_MFDeployEngine"/>       
-      <ComponentRef Id="Component_Crypto"/>
       <ComponentRef Id="COMPONENT_TRUETYPEFONTS"/>
       <ComponentRef Id="Component_ToolsDirectoryShortcut"/>
 <!--

setup/UnManagedAssemblies/build.dirproj

@@ -7,7 +7,6 @@
         TinyCLR.wixproj;
         TFConvert.wixproj;
         BuildHelper.wixproj;
-        Crypto.wixproj
         " />
   </ItemGroup>