Procházet zdrojové kódy

Disable file() and string() hash commands during bootstrap

We do not compile support for the cryptographic hashes during bootstrap.
Disable the APIs that use them.
Brad King před 14 roky
rodič
revize
b0853b5fae
2 změnil soubory, kde provedl 14 přidání a 0 odebrání
  1. 7 0
      Source/cmFileCommand.cxx
  2. 7 0
      Source/cmStringCommand.cxx

+ 7 - 0
Source/cmFileCommand.cxx

@@ -352,6 +352,7 @@ bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args)
 //----------------------------------------------------------------------------
 bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args)
 {
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   if(args.size() != 3)
     {
     cmOStringStream e;
@@ -375,6 +376,12 @@ bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args)
     this->SetError(e.str().c_str());
     }
   return false;
+#else
+  cmOStringStream e;
+  e << args[0] << " not available during bootstrap";
+  this->SetError(e.str().c_str());
+  return false;
+#endif
 }
 
 //----------------------------------------------------------------------------

+ 7 - 0
Source/cmStringCommand.cxx

@@ -96,6 +96,7 @@ bool cmStringCommand
 //----------------------------------------------------------------------------
 bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args)
 {
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   if(args.size() != 3)
     {
     cmOStringStream e;
@@ -112,6 +113,12 @@ bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args)
     return true;
     }
   return false;
+#else
+  cmOStringStream e;
+  e << args[0] << " not available during bootstrap";
+  this->SetError(e.str().c_str());
+  return false;
+#endif
 }
 
 //----------------------------------------------------------------------------