[Cmake-commits] [cmake-commits] zach.mullen committed cmCTest.cxx 1.384 1.385 cmSystemTools.cxx 1.423 1.424 cmSystemTools.h 1.166 1.167

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7241

Modified Files:
	cmCTest.cxx cmSystemTools.cxx cmSystemTools.h 
Log Message:
Make new web api safe for bootstrap build.


Index: cmSystemTools.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.h,v
retrieving revision 1.166
retrieving revision 1.167
diff -C 2 -d -r1.166 -r1.167
*** cmSystemTools.h	21 Dec 2009 20:19:57 -0000	1.166
--- cmSystemTools.h	21 Dec 2009 21:42:32 -0000	1.167
***************
*** 47,62 ****
                                     KeyWOW64 view = KeyWOW64_Default);
  
-   enum HTTPMethod {
-     HTTP_GET,
-     HTTP_POST
-   };
- 
-   /**
-    * Perform an HTTP request.
-    */
-   static int HTTPRequest(std::string url, HTTPMethod method,
-                           std::string& response,
-                           std::string fields = "", int timeout = 10);
- 
    /**
     * Platform independent escape spaces, unix uses backslash,
--- 47,50 ----
***************
*** 355,358 ****
--- 343,358 ----
  
  #ifdef CMAKE_BUILD_WITH_CMAKE
+   enum HTTPMethod {
+     HTTP_GET,
+     HTTP_POST
+   };
+ 
+   /**
+    * Perform an HTTP request.
+    */
+   static int HTTPRequest(std::string url, HTTPMethod method,
+                           std::string& response,
+                           std::string fields = "", int timeout = 10);
+ 
    /** Remove an environment variable */
    static bool UnsetEnv(const char* value);

Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.423
retrieving revision 1.424
diff -C 2 -d -r1.423 -r1.424
*** cmSystemTools.cxx	21 Dec 2009 20:19:57 -0000	1.423
--- cmSystemTools.cxx	21 Dec 2009 21:42:32 -0000	1.424
***************
*** 2943,2946 ****
--- 2943,2947 ----
  }
  
+ #ifdef CMAKE_BUILD_WITH_CMAKE
  //----------------------------------------------------------------------------
  int cmSystemTools::HTTPRequest(std::string url, HTTPMethod method,
***************
*** 2978,2979 ****
--- 2979,2981 ----
    return static_cast<int>(res);
  }
+ #endif

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.384
retrieving revision 1.385
diff -C 2 -d -r1.384 -r1.385
*** cmCTest.cxx	21 Dec 2009 20:47:29 -0000	1.384
--- cmCTest.cxx	21 Dec 2009 21:42:32 -0000	1.385
***************
*** 321,324 ****
--- 321,325 ----
  std::string cmCTest::GetCDashVersion()
  {
+ #ifdef CMAKE_BUILD_WITH_CMAKE
    //First query the server.  If that fails, fall back to the local setting
    std::string response;
***************
*** 329,332 ****
--- 330,336 ----
    
    return res ? this->GetCTestConfiguration("CDashVersion") : response;
+ #else
+   return this->GetCTestConfiguration("CDashVersion");
+ #endif
  }