35 files changed, 584 insertions, 2692 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 98d40d6..6c3398e 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -60,7 +60,7 @@
 # CPACK_DEBIAN_PACKAGE_DEBUG
 #     Mandatory : NO
 #     Default   : -
-#     May be set when invoking cpack in order to trace debug informations
+#     May be set when invoking cpack in order to trace debug information
 #     during CPackDeb run.
 # CPACK_DEBIAN_PACKAGE_PREDEPENDS
 #     Mandatory : NO
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 6455c99..96b6741 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -1,6 +1,4 @@
-# Find the PostgreSQL installation.
-#
-# ----------------------------------------------------------------------------
+# - Find the PostgreSQL installation.
 # Usage:
 # In your CMakeLists.txt file do something like this:
 # ...
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 2c3ba6e..b2a89f7 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1119,6 +1119,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
   INCLUDE("${_qt4_current_dir}/Qt4Macros.cmake")
 
+  # set version variables
+  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
+  STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
+  STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
+
 ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)
 
 #support old QT_MIN_VERSION if set, but not if version is supplied by find_package()
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 8df0bcb..72b5d62 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -43,7 +43,7 @@ endif()
 set(CMAKE_DL_LIBS "")
 set(CMAKE_LIBRARY_PATH_FLAG "-L")
 set(CMAKE_LINK_LIBRARY_FLAG "-l")
-set(CMAKE_LINK_DEF_FILE_FLAG "-Wl,")
+set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough
 set(CMAKE_LINK_LIBRARY_SUFFIX "")
 set(CMAKE_CREATE_WIN32_EXE  "-mwindows")
 
diff --git a/Modules/UsewxWidgets.cmake b/Modules/UsewxWidgets.cmake
index 9ecfff0..a0f2e86 100644
--- a/Modules/UsewxWidgets.cmake
+++ b/Modules/UsewxWidgets.cmake
@@ -6,7 +6,7 @@
 #  # Note that for MinGW users the order of libs is important!
 #  FIND_PACKAGE(wxWidgets REQUIRED net gl core base)
 #  INCLUDE(${wxWidgets_USE_FILE})
-#  # and for each of your dependant executable/library targets:
+#  # and for each of your dependent executable/library targets:
 #  TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
 #
 # DEPRECATED
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index febf205..3c670a1 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -121,9 +121,11 @@ int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup)
           << std::endl);
       // Begin the archive for this group
       std::string packageFileName= std::string(toplevel);
-      packageFileName += "/"
-        +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-        +"-"+compGIt->first + this->GetOutputExtension();
+      packageFileName += "/"+
+       GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"),
+                                   compGIt->first,
+                                   true)
+         + this->GetOutputExtension();
       // open a block in order to automatically close archive
       // at the end of the block
       {
@@ -154,9 +156,11 @@ int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup)
       std::string packageFileName = std::string(toplevel);
 
       localToplevel += "/"+ compIt->first;
-      packageFileName += "/"
-        +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-        +"-"+compIt->first + this->GetOutputExtension();
+      packageFileName += "/"+
+       GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"),
+                                   compIt->first,
+                                   false)
+        + this->GetOutputExtension();
       {
         DECLARE_AND_OPEN_ARCHIVE(packageFileName,archive);
         // Add the files of this component to the archive
@@ -177,7 +181,7 @@ int cmCPackArchiveGenerator::PackageComponentsAllInOne(bool allComponent)
   packageFileNames.push_back(std::string(toplevel));
   packageFileNames[0] += "/"
     +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-    +"-ALL" + this->GetOutputExtension();
+    + this->GetOutputExtension();
   cmCPackLogger(cmCPackLog::LOG_VERBOSE,
                 "Packaging all groups in one package..."
                 "(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE is set)"
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 69d9b8c..86200c1 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1309,10 +1309,51 @@ int cmCPackGenerator::PrepareGroupingKind()
   return 1;
 }
 
+//----------------------------------------------------------------------
 std::string cmCPackGenerator::GetComponentInstallDirNameSuffix(
     const std::string& componentName) {
   return componentName;
 }
+//----------------------------------------------------------------------
+std::string cmCPackGenerator::GetComponentPackageFileName(
+    const std::string& initialPackageFileName,
+    const std::string& groupOrComponentName,
+    bool isGroupName) {
+
+  /*
+   * the default behavior is to use the
+   * component [group] name as a suffix
+   */
+  std::string suffix="-"+groupOrComponentName;
+  /* check if we should use DISPLAY name */
+  std::string dispNameVar = "CPACK_"+Name+"_USE_DISPLAY_NAME_IN_FILENAME";
+  if (IsOn(dispNameVar.c_str()))
+    {
+    /* the component Group case */
+    if (isGroupName)
+      {
+      std::string groupDispVar = "CPACK_COMPONENT_GROUP_"
+          + cmSystemTools::UpperCase(groupOrComponentName) + "_DISPLAY_NAME";
+      const char* groupDispName = GetOption(groupDispVar.c_str());
+      if (groupDispName)
+        {
+        suffix = "-"+std::string(groupDispName);
+        }
+      }
+    /* the [single] component case */
+    else
+      {
+      std::string dispVar = "CPACK_COMPONENT_"
+           + cmSystemTools::UpperCase(groupOrComponentName) + "_DISPLAY_NAME";
+            const char* dispName = GetOption(dispVar.c_str());
+            if(dispName)
+              {
+              suffix = "-"+std::string(dispName);
+              }
+            }
+      }
+  return initialPackageFileName + suffix;
+}
 
 //----------------------------------------------------------------------
 bool cmCPackGenerator::SupportsComponentInstallation() const
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index d4b1b16..0497d1c 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -145,6 +145,19 @@ protected:
       const std::string& componentName);
 
   /**
+   * CPack specific generator may mangle CPACK_PACKAGE_FILE_NAME
+   * with CPACK_COMPONENT_xxxx_<NAME>_DISPLAY_NAME if
+   * CPACK_<GEN>_USE_DISPLAY_NAME_IN_FILENAME is ON.
+   * @param[in] initialPackageFileName
+   * @param[in] groupOrComponentName
+   * @param[in] isGroupName
+   */
+  virtual std::string GetComponentPackageFileName(
+      const std::string& initialPackageFileName,
+      const std::string& groupOrComponentName,
+      bool isGroupName);
+
+  /**
    * Package the list of files and/or components which
    * has been prepared by the beginning of DoPackage.
    * @pre @ref toplevel has been filled-in
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 2d675c1..0b0c6b1 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -31,6 +31,21 @@ int cmCPackRPMGenerator::InitializeInternal()
     {
     this->SetOption("CPACK_SET_DESTDIR", "I_ON");
     }
+  /* Replace space in CPACK_PACKAGE_NAME in order to avoid
+   * rpmbuild scream on unwanted space in filename issue
+   * Moreover RPM file do not usually embed space in filename
+   */
+  if (this->GetOption("CPACK_PACKAGE_NAME")) {
+    std::string packageName=this->GetOption("CPACK_PACKAGE_NAME");
+    cmSystemTools::ReplaceString(packageName," ","-");
+    this->SetOption("CPACK_PACKAGE_NAME",packageName.c_str());
+  }
+  /* same for CPACK_PACKAGE_FILE_NAME */
+  if (this->GetOption("CPACK_PACKAGE_FILE_NAME")) {
+    std::string packageName=this->GetOption("CPACK_PACKAGE_FILE_NAME");
+    cmSystemTools::ReplaceString(packageName," ","-");
+    this->SetOption("CPACK_PACKAGE_FILE_NAME",packageName.c_str());
+  }
   return this->Superclass::InitializeInternal();
 }
 
@@ -60,8 +75,10 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup)
           cmSystemTools::GetParentDirectory(toplevel.c_str())
                                  );
       std::string outputFileName(
-          std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-          +"-"+compGIt->first + this->GetOutputExtension()
+       GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"),
+                                   compGIt->first,
+                                   true)
+                                   + this->GetOutputExtension()
                                 );
 
       localToplevel += "/"+ compGIt->first;
@@ -98,9 +115,10 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup)
           cmSystemTools::GetParentDirectory(toplevel.c_str())
                                  );
       std::string outputFileName(
-          std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")
-                                )
-        +"-"+compIt->first + this->GetOutputExtension());
+       GetComponentPackageFileName(this->GetOption("CPACK_PACKAGE_FILE_NAME"),
+                                   compIt->first,
+                                   false)
+       + this->GetOutputExtension());
 
       localToplevel += "/"+ compIt->first;
       /* replace the TEMP DIRECTORY with the component one */
@@ -158,7 +176,7 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne(bool allComponent)
                              );
   std::string outputFileName(
             std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-            +"-ALL"+ this->GetOutputExtension()
+            + this->GetOutputExtension()
                             );
   // all GROUP in one vs all COMPONENT in one
   localToplevel += "/"+compInstDirName;
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index eb78647..c4ea425 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -102,7 +102,7 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile() const
   fout <<
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
-    "\t<name>" << name << "</name>\n"
+    "\t<name>" << this->EscapeForXML(name) << "</name>\n"
     "\t<comment></comment>\n"
     "\t<projects>\n"
     "\t</projects>\n"
@@ -376,11 +376,10 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "\t</natures>\n"
     ;
 
-  // TODO: refactor this
+  fout << "\t<linkedResources>\n";
   // create linked resources
   if (this->IsOutOfSourceBuild)
     {
-    fout << "\t<linkedResources>\n";
     // create a linked resource to CMAKE_SOURCE_DIR
     // (this is not done anymore for each project because of
     // http://public.kitware.com/Bug/view.php?id=9978 and because I found it
@@ -399,18 +398,48 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
       this->SrcLinkedResources.push_back(sourceLinkedResourceName);
       }
 
-    // for EXECUTABLE_OUTPUT_PATH when not in binary dir
-    this->AppendOutLinkedResource(fout,
-      mf->GetSafeDefinition("CMAKE_RUNTIME_OUTPUT_DIRECTORY"),
-      mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"));
-    // for LIBRARY_OUTPUT_PATH when not in binary dir
-    this->AppendOutLinkedResource(fout,
-      mf->GetSafeDefinition("CMAKE_LIBRARY_OUTPUT_DIRECTORY"),
-      mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"));
+    }
+
+  // for each sub project create a linked resource to the source dir
+  // - only if it is an out-of-source build
+  this->AppendLinkedResource(fout, "[Subprojects]",
+                             "virtual:/virtual");
 
-    fout << "\t</linkedResources>\n";
+  for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator
+       it = this->GlobalGenerator->GetProjectMap().begin();
+       it != this->GlobalGenerator->GetProjectMap().end();
+       ++it)
+    {
+    std::string linkSourceDirectory = this->GetEclipsePath(
+                            it->second[0]->GetMakefile()->GetStartDirectory());
+    // a linked resource must not point to a parent directory of .project or
+    // .project itself
+    if ((this->HomeOutputDirectory != linkSourceDirectory) &&
+        !cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
+                                       linkSourceDirectory.c_str()))
+      {
+      std::string linkName = "[Subprojects]/";
+      linkName += it->first;
+      this->AppendLinkedResource(fout, linkName,
+                                 this->GetEclipsePath(linkSourceDirectory));
+      this->SrcLinkedResources.push_back(it->first);
+      }
     }
 
+  // I'm not sure this makes too much sense. There can be different
+  // output directories in different subdirs, so we would need more of them.
+
+  // for EXECUTABLE_OUTPUT_PATH when not in binary dir
+  this->AppendOutLinkedResource(fout,
+    mf->GetSafeDefinition("CMAKE_RUNTIME_OUTPUT_DIRECTORY"),
+    mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"));
+  // for LIBRARY_OUTPUT_PATH when not in binary dir
+  this->AppendOutLinkedResource(fout,
+    mf->GetSafeDefinition("CMAKE_LIBRARY_OUTPUT_DIRECTORY"),
+    mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"));
+
+  fout << "\t</linkedResources>\n";
+
   fout << "</projectDescription>\n";
 }
 
@@ -551,14 +580,15 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->SrcLinkedResources.end();
        ++it)
     {
-    fout << "<pathentry kind=\"src\" path=\"" << *it << "\"/>\n";
+    fout << "<pathentry kind=\"src\" path=\"" << this->EscapeForXML(*it)
+         << "\"/>\n";
 
     // exlude source directory from output search path
     // - only if not named the same as an output directory
     if (!cmSystemTools::FileIsDirectory(
            std::string(this->HomeOutputDirectory + "/" + *it).c_str()))
       {
-      excludeFromOut += *it + "/|";
+      excludeFromOut += this->EscapeForXML(*it) + "/|";
       }
     }
   excludeFromOut += "**/CMakeFiles/";
@@ -573,7 +603,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->OutLinkedResources.end();
        ++it)
     {
-    fout << "<pathentry kind=\"out\" path=\"" << *it << "\"/>\n";
+    fout << "<pathentry kind=\"out\" path=\"" << this->EscapeForXML(*it)
+         << "\"/>\n";
     }
 
   // add pre-processor definitions to allow eclipse to gray out sections
@@ -1055,11 +1086,13 @@ void cmExtraEclipseCDT4Generator
 {
   fout <<
     "\t\t<link>\n"
-    "\t\t\t<name>" << name << "</name>\n"
+    "\t\t\t<name>"
+    << cmExtraEclipseCDT4Generator::EscapeForXML(name)
+    << "</name>\n"
     "\t\t\t<type>2</type>\n"
-    "\t\t\t<location>"
-    << path
-    << "</location>\n"
+    "\t\t\t<locationURI>"
+    << cmExtraEclipseCDT4Generator::EscapeForXML(path)
+    << "</locationURI>\n"
     "\t\t</link>\n"
     ;
 }
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 131661d..d28de08 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -75,6 +75,10 @@ bool cmFileCommand
     {
     return this->HandleDownloadCommand(args);
     }
+  else if ( subCommand == "UPLOAD" )
+    {
+    return this->HandleUploadCommand(args);
+    }
   else if ( subCommand == "READ" )
     {
     return this->HandleReadCommand(args);
@@ -2416,53 +2420,66 @@ bool cmFileCommand::HandleCMakePathCommand(std::vector<std::string>
   this->Makefile->AddDefinition(var, value.c_str());
   return true;
 }
+
+
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 
-// Stuff for curl download
+// Stuff for curl download/upload
 typedef std::vector<char> cmFileCommandVectorOfChar;
-namespace{
+
+namespace {
+
   size_t
-  cmFileCommandWriteMemoryCallback(void *ptr, size_t size, size_t nmemb,
-                                          void *data)
-  { 
+  cmWriteToFileCallback(void *ptr, size_t size, size_t nmemb,
+                        void *data)
+    {
     register int realsize = (int)(size * nmemb);
     std::ofstream* fout = static_cast<std::ofstream*>(data);
     const char* chPtr = static_cast<char*>(ptr);
     fout->write(chPtr, realsize);
     return realsize;
-  }
+    }
+
+
+  size_t
+  cmWriteToMemoryCallback(void *ptr, size_t size, size_t nmemb,
+                          void *data)
+    {
+    register int realsize = (int)(size * nmemb);
+    cmFileCommandVectorOfChar *vec
+      = static_cast<cmFileCommandVectorOfChar*>(data);
+    const char* chPtr = static_cast<char*>(ptr);
+    vec->insert(vec->end(), chPtr, chPtr + realsize);
+    return realsize;
+    }
 
 
   static size_t
   cmFileCommandCurlDebugCallback(CURL *, curl_infotype, char *chPtr,
-                                        size_t size, void *data)
-  {
+                                 size_t size, void *data)
+    {
     cmFileCommandVectorOfChar *vec
       = static_cast<cmFileCommandVectorOfChar*>(data);
     vec->insert(vec->end(), chPtr, chPtr + size);
-
     return size;
-  }
+    }
 
 
   class cURLProgressHelper
   {
   public:
-    cURLProgressHelper(cmFileCommand *fc)
+    cURLProgressHelper(cmFileCommand *fc, const char *text)
       {
       this->CurrentPercentage = -1;
       this->FileCommand = fc;
+      this->Text = text;
       }
 
     bool UpdatePercentage(double value, double total, std::string &status)
       {
       int OldPercentage = this->CurrentPercentage;
 
-      if (0.0 == total)
-        {
-        this->CurrentPercentage = 100;
-        }
-      else
+      if (total > 0.0)
         {
         this->CurrentPercentage = static_cast<int>(value/total*100.0 + 0.5);
         }
@@ -2472,7 +2489,8 @@ namespace{
       if (updated)
         {
         cmOStringStream oss;
-        oss << "[download " << this->CurrentPercentage << "% complete]";
+        oss << "[" << this->Text << " " << this->CurrentPercentage
+            << "% complete]";
         status = oss.str();
         }
 
@@ -2487,14 +2505,15 @@ namespace{
   private:
     int CurrentPercentage;
     cmFileCommand *FileCommand;
+    std::string Text;
   };
 
 
   static int
-  cmFileCommandCurlProgressCallback(void *clientp,
-                                    double dltotal, double dlnow,
-                                    double ultotal, double ulnow)
-  {
+  cmFileDownloadProgressCallback(void *clientp,
+                                 double dltotal, double dlnow,
+                                 double ultotal, double ulnow)
+    {
     cURLProgressHelper *helper =
       reinterpret_cast<cURLProgressHelper *>(clientp);
 
@@ -2510,12 +2529,33 @@ namespace{
       }
 
     return 0;
-  }
+    }
+
+
+  static int
+  cmFileUploadProgressCallback(void *clientp,
+                               double dltotal, double dlnow,
+                               double ultotal, double ulnow)
+    {
+    cURLProgressHelper *helper =
+    reinterpret_cast<cURLProgressHelper *>(clientp);
+
+    static_cast<void>(dltotal);
+    static_cast<void>(dlnow);
+
+    std::string status;
+    if (helper->UpdatePercentage(ulnow, ultotal, status))
+      {
+      cmFileCommand *fc = helper->GetFileCommand();
+      cmMakefile *mf = fc->GetMakefile();
+      mf->DisplayStatus(status.c_str(), -1);
+      }
+
+    return 0;
+    }
 }
 
-#endif
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
 namespace {
 
   class cURLEasyGuard
@@ -2547,9 +2587,18 @@ namespace {
 #endif
 
 
+#define check_curl_result(result, errstr) \
+  if (result != CURLE_OK)                 \
+    {                                     \
+    std::string e(errstr);                \
+    e += ::curl_easy_strerror(result);    \
+    this->SetError(e.c_str());            \
+    return false;                         \
+    }
+
+
 bool
-cmFileCommand::HandleDownloadCommand(std::vector<std::string>
-                                     const& args)
+cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
 {
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   std::vector<std::string>::const_iterator i = args.begin();
@@ -2688,88 +2737,37 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string>
   cURLEasyGuard g_curl(curl);
 
   ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-  if (res != CURLE_OK)
-    {
-    std::string e = "DOWNLOAD cannot set url: ";
-    e += ::curl_easy_strerror(res);
-    this->SetError(e.c_str());
-    return false;
-    }
+  check_curl_result(res, "DOWNLOAD cannot set url: ");
 
   res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
-                           cmFileCommandWriteMemoryCallback);
-  if (res != CURLE_OK)
-    {
-    std::string e = "DOWNLOAD cannot set write function: ";
-    e += ::curl_easy_strerror(res);
-    this->SetError(e.c_str());
-    return false;
-    }
+                           cmWriteToFileCallback);
+  check_curl_result(res, "DOWNLOAD cannot set write function: ");
 
   res = ::curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION,
                            cmFileCommandCurlDebugCallback);
-  if (res != CURLE_OK)
-    {
-    std::string e = "DOWNLOAD cannot set debug function: ";
-    e += ::curl_easy_strerror(res);
-    this->SetError(e.c_str());
-    return false;
-    }
+  check_curl_result(res, "DOWNLOAD cannot set debug function: ");
 
   cmFileCommandVectorOfChar chunkDebug;
 
   res = ::curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&fout);
-
-  if (res != CURLE_OK)
-    {
-    std::string e = "DOWNLOAD cannot set write data: ";
-    e += ::curl_easy_strerror(res);
-    this->SetError(e.c_str());
-    return false;
-    }
+  check_curl_result(res, "DOWNLOAD cannot set write data: ");
 
   res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, (void *)&chunkDebug);
-  if (res != CURLE_OK)
-    {
-    std::string e = "DOWNLOAD cannot set debug data: ";
-    e += ::curl_easy_strerror(res);
-    this->SetError(e.c_str());
-    return false;
-    }
+  check_curl_result(res, "DOWNLOAD cannot set debug data: ");
 
   res = ::curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-  if (res != CURLE_OK)
-    {
-    std::string e = "DOWNLOAD cannot set follow-redirect option: ";
-    e += ::curl_easy_strerror(res);
-    this->SetError(e.c_str());
-    return false;
-    }
+  check_curl_result(res, "DOWNLOAD cannot set follow-redirect option: ");
 
   if(verboseLog.size())
     {
     res = ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-
-    if (res != CURLE_OK)
-      {
-      std::string e = "DOWNLOAD cannot set verbose: ";
-      e += ::curl_easy_strerror(res);
-      this->SetError(e.c_str());
-      return false;
-      }
+    check_curl_result(res, "DOWNLOAD cannot set verbose: ");
     }
 
   if(timeout > 0)
     {
     res = ::curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout );
-
-    if (res != CURLE_OK)
-      {
-      std::string e = "DOWNLOAD cannot set timeout: ";
-      e += ::curl_easy_strerror(res);
-      this->SetError(e.c_str());
-      return false;
-      }
+    check_curl_result(res, "DOWNLOAD cannot set timeout: ");
     }
 
   // Need the progress helper's scope to last through the duration of
@@ -2777,39 +2775,20 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string>
   // scope intentionally, rather than inside the "if(showProgress)"
   // block...
   //
-  cURLProgressHelper helper(this);
+  cURLProgressHelper helper(this, "download");
 
   if(showProgress)
     {
-    res = ::curl_easy_setopt(curl,
-      CURLOPT_NOPROGRESS, 0);
-    if (res != CURLE_OK)
-      {
-      std::string e = "DOWNLOAD cannot set noprogress value: ";
-      e += ::curl_easy_strerror(res);
-      this->SetError(e.c_str());
-      return false;
-      }
+    res = ::curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
+    check_curl_result(res, "DOWNLOAD cannot set noprogress value: ");
 
     res = ::curl_easy_setopt(curl,
-      CURLOPT_PROGRESSFUNCTION, cmFileCommandCurlProgressCallback);
-    if (res != CURLE_OK)
-      {
-      std::string e = "DOWNLOAD cannot set progress function: ";
-      e += ::curl_easy_strerror(res);
-      this->SetError(e.c_str());
-      return false;
-      }
+      CURLOPT_PROGRESSFUNCTION, cmFileDownloadProgressCallback);
+    check_curl_result(res, "DOWNLOAD cannot set progress function: ");
 
     res = ::curl_easy_setopt(curl,
       CURLOPT_PROGRESSDATA, reinterpret_cast<void*>(&helper));
-    if (res != CURLE_OK)
-      {
-      std::string e = "DOWNLOAD cannot set progress data: ";
-      e += ::curl_easy_strerror(res);
-      this->SetError(e.c_str());
-      return false;
-      }
+    check_curl_result(res, "DOWNLOAD cannot set progress data: ");
     }
 
   res = ::curl_easy_perform(curl);
@@ -2885,3 +2864,220 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string>
   return false;
 #endif
 }
+
+
+bool
+cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
+{
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+  if(args.size() < 3)
+    {
+    this->SetError("UPLOAD must be called with at least three arguments.");
+    return false;
+    }
+  std::vector<std::string>::const_iterator i = args.begin();
+  ++i;
+  std::string filename = *i;
+  ++i;
+  std::string url = *i;
+  ++i;
+
+  long timeout = 0;
+  std::string logVar;
+  std::string statusVar;
+  bool showProgress = false;
+
+  while(i != args.end())
+    {
+    if(*i == "TIMEOUT")
+      {
+      ++i;
+      if(i != args.end())
+        {
+        timeout = atol(i->c_str());
+        }
+      else
+        {
+        this->SetError("UPLOAD missing time for TIMEOUT.");
+        return false;
+        }
+      }
+    else if(*i == "LOG")
+      {
+      ++i;
+      if( i == args.end())
+        {
+        this->SetError("UPLOAD missing VAR for LOG.");
+        return false;
+        }
+      logVar = *i;
+      }
+    else if(*i == "STATUS")
+      {
+      ++i;
+      if( i == args.end())
+        {
+        this->SetError("UPLOAD missing VAR for STATUS.");
+        return false;
+        }
+      statusVar = *i;
+      }
+    else if(*i == "SHOW_PROGRESS")
+      {
+      showProgress = true;
+      }
+
+    ++i;
+    }
+
+  // Open file for reading:
+  //
+  FILE *fin = fopen(filename.c_str(), "rb");
+  if(!fin)
+    {
+    std::string errStr = "UPLOAD cannot open file '";
+    errStr += filename + "' for reading.";
+    this->SetError(errStr.c_str());
+    return false;
+    }
+
+  struct stat st;
+  if(::stat(filename.c_str(), &st))
+    {
+    std::string errStr = "UPLOAD cannot stat file '";
+    errStr += filename + "'.";
+    this->SetError(errStr.c_str());
+    return false;
+    }
+
+  ::CURL *curl;
+  ::curl_global_init(CURL_GLOBAL_DEFAULT);
+  curl = ::curl_easy_init();
+  if(!curl)
+    {
+    this->SetError("UPLOAD error initializing curl.");
+    return false;
+    }
+
+  cURLEasyGuard g_curl(curl);
+
+  // enable HTTP ERROR parsing
+  ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+
+  // enable uploading
+  res = ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
+  check_curl_result(res, "UPLOAD cannot set upload flag: ");
+
+  res = ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+  check_curl_result(res, "UPLOAD cannot set url: ");
+
+  res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
+                           cmWriteToMemoryCallback);
+  check_curl_result(res, "UPLOAD cannot set write function: ");
+
+  res = ::curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION,
+                           cmFileCommandCurlDebugCallback);
+  check_curl_result(res, "UPLOAD cannot set debug function: ");
+
+  cmFileCommandVectorOfChar chunkResponse;
+  cmFileCommandVectorOfChar chunkDebug;
+
+  res = ::curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunkResponse);
+  check_curl_result(res, "UPLOAD cannot set write data: ");
+
+  res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, (void *)&chunkDebug);
+  check_curl_result(res, "UPLOAD cannot set debug data: ");
+
+  res = ::curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+  check_curl_result(res, "UPLOAD cannot set follow-redirect option: ");
+
+  if(logVar.size())
+    {
+    res = ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+    check_curl_result(res, "UPLOAD cannot set verbose: ");
+    }
+
+  if(timeout > 0)
+    {
+    res = ::curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout );
+    check_curl_result(res, "UPLOAD cannot set timeout: ");
+    }
+
+  // Need the progress helper's scope to last through the duration of
+  // the curl_easy_perform call... so this object is declared at function
+  // scope intentionally, rather than inside the "if(showProgress)"
+  // block...
+  //
+  cURLProgressHelper helper(this, "upload");
+
+  if(showProgress)
+    {
+    res = ::curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
+    check_curl_result(res, "UPLOAD cannot set noprogress value: ");
+
+    res = ::curl_easy_setopt(curl,
+      CURLOPT_PROGRESSFUNCTION, cmFileUploadProgressCallback);
+    check_curl_result(res, "UPLOAD cannot set progress function: ");
+
+    res = ::curl_easy_setopt(curl,
+      CURLOPT_PROGRESSDATA, reinterpret_cast<void*>(&helper));
+    check_curl_result(res, "UPLOAD cannot set progress data: ");
+    }
+
+  // now specify which file to upload
+  res = ::curl_easy_setopt(curl, CURLOPT_INFILE, fin);
+  check_curl_result(res, "UPLOAD cannot set input file: ");
+
+  // and give the size of the upload (optional)
+  res = ::curl_easy_setopt(curl,
+    CURLOPT_INFILESIZE, static_cast<long>(st.st_size));
+  check_curl_result(res, "UPLOAD cannot set input file size: ");
+
+  res = ::curl_easy_perform(curl);
+
+  /* always cleanup */
+  g_curl.release();
+  ::curl_easy_cleanup(curl);
+
+  if(statusVar.size())
+    {
+    cmOStringStream result;
+    result << (int)res << ";\"" << ::curl_easy_strerror(res) << "\"";
+    this->Makefile->AddDefinition(statusVar.c_str(),
+                                  result.str().c_str());
+    }
+
+  ::curl_global_cleanup();
+
+  fclose(fin);
+  fin = NULL;
+
+  if(logVar.size())
+    {
+    std::string log;
+
+    if(chunkResponse.size())
+      {
+      chunkResponse.push_back(0);
+      log += "Response:\n";
+      log += &*chunkResponse.begin();
+      log += "\n";
+      }
+
+    if(chunkDebug.size())
+      {
+      chunkDebug.push_back(0);
+      log += "Debug:\n";
+      log += &*chunkDebug.begin();
+      log += "\n";
+      }
+
+    this->Makefile->AddDefinition(logVar.c_str(), log.c_str());
+    }
+
+  return true;
+#else
+  this->SetError("UPLOAD not supported by bootstrap cmake.");
+  return false;
+#endif
+}
diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index b11dcde..1b6dbbf 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -82,6 +82,8 @@ public:
       "  file(TO_NATIVE_PATH path result)\n"
       "  file(DOWNLOAD url file [TIMEOUT timeout] [STATUS status] [LOG log]\n"
       "       [EXPECTED_MD5 sum] [SHOW_PROGRESS])\n"
+      "  file(UPLOAD filename url [TIMEOUT timeout] [STATUS status]\n"
+      "       [LOG log] [SHOW_PROGRESS])\n"
       "WRITE will write a message into a file called 'filename'. It "
       "overwrites the file if it already exists, and creates the file "
       "if it does not exist.\n"
@@ -165,6 +167,18 @@ public:
       "If SHOW_PROGRESS is specified, progress information will be printed "
       "as status messages until the operation is complete."
       "\n"
+      "UPLOAD will upload the given file to the given URL. "
+      "If LOG var is specified a log of the upload will be put in var. "
+      "If STATUS var is specified the status of the operation will"
+      " be put in var. The status is returned in a list of length 2. "
+      "The first element is the numeric return value for the operation, "
+      "and the second element is a string value for the error. A 0 "
+      "numeric error means no error in the operation. "
+      "If TIMEOUT time is specified, the operation will "
+      "timeout after time seconds, time should be specified as an integer. "
+      "If SHOW_PROGRESS is specified, progress information will be printed "
+      "as status messages until the operation is complete."
+      "\n"
       "The file() command also provides COPY and INSTALL signatures:\n"
       "  file(<COPY|INSTALL> files... DESTINATION <dir>\n"
       "       [FILE_PERMISSIONS permissions...]\n"
@@ -223,6 +237,7 @@ protected:
   bool HandleCopyCommand(std::vector<std::string> const& args);
   bool HandleInstallCommand(std::vector<std::string> const& args);
   bool HandleDownloadCommand(std::vector<std::string> const& args);
+  bool HandleUploadCommand(std::vector<std::string> const& args);
 };
 
 
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 2d1f792..37070b6 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -453,7 +453,7 @@ cmPolicies::cmPolicies()
     "Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e. "
     "located in the CMake module directory) calls include() or "
     "find_package(), the files located in the the CMake module directory are "
-    "prefered over the files in CMAKE_MODULE_PATH.  "
+    "preferred over the files in CMAKE_MODULE_PATH.  "
     "This makes sure that the modules belonging to "
     "CMake always get those files included which they expect, and against "
     "which they were developed and tested.  "
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b0e20ba..3b1f016 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -326,7 +326,7 @@ public:
    */
   bool FindSourceFiles();
 
-  ///! Return the prefered linker language for this target
+  ///! Return the preferred linker language for this target
   const char* GetLinkerLanguage(const char* config = 0);
 
   ///! Return the rule variable used to create this type of target,
diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake
index 2d9315c..990a201 100644
--- a/Source/kwsys/kwsysDateStamp.cmake
+++ b/Source/kwsys/kwsysDateStamp.cmake
@@ -15,7 +15,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2011)
 
 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 02)
+SET(KWSYS_DATE_STAMP_MONTH 03)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   24)
+SET(KWSYS_DATE_STAMP_DAY   01)
diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt
index 8fd52df..cceef3b 100644
--- a/Tests/CMakeTests/CMakeLists.txt
+++ b/Tests/CMakeTests/CMakeLists.txt
@@ -33,6 +33,8 @@ set_property(TEST CMake.FileDownload PROPERTY
   PASS_REGULAR_EXPRESSION "file already exists with expected MD5 sum"
   )
 
+AddCMakeTest(FileUpload "")
+
 if(HAVE_ELF_H)
   AddCMakeTest(ELF "")
 endif()
diff --git a/Tests/CMakeTests/FileTest.cmake.in b/Tests/CMakeTests/FileTest.cmake.in
index 721f311..b6dcaa6 100644
--- a/Tests/CMakeTests/FileTest.cmake.in
+++ b/Tests/CMakeTests/FileTest.cmake.in
@@ -27,7 +27,7 @@ check_cmake_test(File
 # Also execute each test listed in FileTestScript.cmake:
 #
 set(scriptname "@CMAKE_CURRENT_SOURCE_DIR@/FileTestScript.cmake")
-set(number_of_tests_expected 56)
+set(number_of_tests_expected 62)
 
 include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake")
 execute_all_script_tests(${scriptname} number_of_tests_executed)
diff --git a/Tests/CMakeTests/FileTestScript.cmake b/Tests/CMakeTests/FileTestScript.cmake
index c4e27bd..9a43569 100644
--- a/Tests/CMakeTests/FileTestScript.cmake
+++ b/Tests/CMakeTests/FileTestScript.cmake
@@ -201,6 +201,26 @@ elseif(testname STREQUAL download_with_bogus_protocol) # pass
   message("l='${l}'")
   message("s='${s}'")
 
+elseif(testname STREQUAL upload_wrong_number_of_args) # fail
+  file(UPLOAD ./ffff)
+
+elseif(testname STREQUAL upload_missing_time) # fail
+  file(UPLOAD ./ffff zzzz://bogus/ffff TIMEOUT)
+
+elseif(testname STREQUAL upload_missing_log_var) # fail
+  file(UPLOAD ./ffff zzzz://bogus/ffff TIMEOUT 2 LOG)
+
+elseif(testname STREQUAL upload_missing_status_var) # fail
+  file(UPLOAD ./ffff zzzz://bogus/ffff TIMEOUT 2 LOG l STATUS)
+
+elseif(testname STREQUAL upload_file_that_doesnt_exist) # fail
+  file(UPLOAD ./ffff zzzz://bogus/ffff)
+
+elseif(testname STREQUAL upload_with_bogus_protocol) # pass
+  file(UPLOAD ${CMAKE_CURRENT_LIST_FILE} zzzz://bogus/ffff TIMEOUT 2 LOG l STATUS s)
+  message("l='${l}'")
+  message("s='${s}'")
+
 else() # fail
   message(FATAL_ERROR "testname='${testname}' - error: no such test in '${CMAKE_CURRENT_LIST_FILE}'")
 
diff --git a/Tests/CMakeTests/FileUploadTest.cmake.in b/Tests/CMakeTests/FileUploadTest.cmake.in
new file mode 100644
index 0000000..8577aef
--- /dev/null
+++ b/Tests/CMakeTests/FileUploadTest.cmake.in
@@ -0,0 +1,49 @@
+file(REMOVE_RECURSE "@CMAKE_CURRENT_BINARY_DIR@/uploads")
+
+if(EXISTS "@CMAKE_CURRENT_BINARY_DIR@/uploads/file1.png")
+  message(FATAL_ERROR "error: file1.png exists - should have been deleted")
+endif()
+if(EXISTS "@CMAKE_CURRENT_BINARY_DIR@/uploads/file2.png")
+  message(FATAL_ERROR "error: file2.png exists - should have been deleted")
+endif()
+
+file(MAKE_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/uploads")
+
+set(filename "@CMAKE_CURRENT_SOURCE_DIR@/FileDownloadInput.png")
+set(urlbase "file://@CMAKE_CURRENT_BINARY_DIR@/uploads")
+
+message(STATUS "FileUpload:1")
+file(UPLOAD
+  ${filename}
+  ${urlbase}/file1.png
+  TIMEOUT 2
+  )
+
+message(STATUS "FileUpload:2")
+file(UPLOAD
+  ${filename}
+  ${urlbase}/file2.png
+  STATUS status
+  LOG log
+  SHOW_PROGRESS
+  )
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E md5sum
+  "@CMAKE_CURRENT_BINARY_DIR@/uploads/file1.png"
+  OUTPUT_VARIABLE sum1
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(NOT sum1 MATCHES "^d16778650db435bda3a8c3435c3ff5d1  .*/uploads/file1.png$")
+  message(FATAL_ERROR "file1.png did not upload correctly (sum1='${sum1}')")
+endif()
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E md5sum
+  "@CMAKE_CURRENT_BINARY_DIR@/uploads/file2.png"
+  OUTPUT_VARIABLE sum2
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(NOT sum2 MATCHES "^d16778650db435bda3a8c3435c3ff5d1  .*/uploads/file2.png$")
+  message(FATAL_ERROR "file2.png did not upload correctly (sum2='${sum2}')")
+endif()
+
+message(STATUS "log='${log}'")
+message(STATUS "status='${status}'")
+message(STATUS "DONE")
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index d5137bd..45a3b17 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -32,17 +32,6 @@ if(config_type)
   set(config_args -C ${config_type})
 endif()
 message(" ${config_args}")
-execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
-    RESULT_VARIABLE CPack_result
-    OUTPUT_VARIABLE CPack_output
-    ERROR_VARIABLE CPack_error
-    WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
-
-if (CPack_result)
-  message(FATAL_ERROR "error: CPack execution went wrong!, CPack_output=${CPack_output}, CPack_error=${CPack_error}")
-else (CPack_result)
-  message(STATUS "CPack_output=${CPack_output}")
-endif(CPack_result)
 
 if(CPackGen MATCHES "ZIP")
     set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
@@ -63,6 +52,26 @@ if(CPackGen MATCHES "ZIP")
     endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
 endif(CPackGen MATCHES "ZIP")
 
+# clean-up previously CPack generated files
+if(expected_file_mask)
+  file(GLOB expected_file "${expected_file_mask}")
+  if (expected_file)
+    file(REMOVE ${expected_file})
+  endif(expected_file)
+endif(expected_file_mask)
+
+execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
+    RESULT_VARIABLE CPack_result
+    OUTPUT_VARIABLE CPack_output
+    ERROR_VARIABLE CPack_error
+    WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
+
+if (CPack_result)
+  message(FATAL_ERROR "error: CPack execution went wrong!, CPack_output=${CPack_output}, CPack_error=${CPack_error}")
+else (CPack_result)
+  message(STATUS "CPack_output=${CPack_output}")
+endif(CPack_result)
+
 # Now verify if the number of expected file is OK
 # - using expected_file_mask and
 # - expected_count
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index 04563ef..c68d543 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -22,8 +22,19 @@ elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
   endif()
 endif()
 
+# Pick a module .def file with the properly mangled symbol name.
+set(world_def "")
+if(WIN32 AND NOT CYGWIN)
+  if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+    set(world_def world_gnu.def)
+  elseif("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel" OR
+      "${CMAKE_GENERATOR}" MATCHES "Visual Studio") # Intel plugin
+    set(world_def world_icl.def)
+  endif()
+endif()
+
 add_library(hello STATIC hello.f)
-add_library(world ${_SHARED} world.f world.def)
+add_library(world ${_SHARED} world.f ${world_def})
 add_executable(testf testf.f)
 target_link_libraries(testf hello world)
 
diff --git a/Tests/Fortran/world_gnu.def b/Tests/Fortran/world_gnu.def
new file mode 100644
index 0000000..1617798
--- /dev/null
+++ b/Tests/Fortran/world_gnu.def
@@ -0,0 +1,2 @@
+EXPORTS
+        world_
diff --git a/Tests/Fortran/world.def b/Tests/Fortran/world_icl.def
index ead7710..ead7710 100644
--- a/Tests/Fortran/world.def
+++ b/Tests/Fortran/world_icl.def
diff --git a/Utilities/cmcurl/easy.c b/Utilities/cmcurl/easy.c
index f3c2273..209d1c3 100644
--- a/Utilities/cmcurl/easy.c
+++ b/Utilities/cmcurl/easy.c
@@ -708,7 +708,7 @@ void curl_easy_reset(CURL *curl)
   data->set.ssl.verifypeer = TRUE;
   data->set.ssl.verifyhost = 2;
 #ifdef CURL_CA_BUNDLE
-  /* This is our prefered CA cert bundle since install time */
+  /* This is our preferred CA cert bundle since install time */
   data->set.ssl.CAfile = (char *)CURL_CA_BUNDLE;
 #endif
 
diff --git a/Utilities/cmcurl/setup.h b/Utilities/cmcurl/setup.h
index e302f35..5ae881f 100644
--- a/Utilities/cmcurl/setup.h
+++ b/Utilities/cmcurl/setup.h
@@ -155,7 +155,7 @@ typedef unsigned char bool;
 #define SIZEOF_CURL_OFF_T 4
 #endif
 
-/* We set up our internal prefered (CURL_)FORMAT_OFF_T here */
+/* We set up our internal preferred (CURL_)FORMAT_OFF_T here */
 #if SIZEOF_CURL_OFF_T > 4
 #define FORMAT_OFF_T "lld"
 #else
diff --git a/Utilities/cmlibarchive/build/windows/mvcpp.nt b/Utilities/cmlibarchive/build/windows/mvcpp.nt
deleted file mode 100644
index 228fc5d..0000000
--- a/Utilities/cmlibarchive/build/windows/mvcpp.nt
+++ /dev/null
@@ -1,117 +0,0 @@
-#/* FILE: mvcpp.nt
-# *
-# *          Copyright (c) 2008
-# *          TouchNet Information Systems, Inc.
-# *          All Rights Reserved
-# *
-# *  This program is an unpublished copyright work of TouchNet Information
-# *  Systems, Inc. of Lenexa, KS.  The program, all information disclosed
-# *  and the matter shown and described hereon or herewith are confidential
-# *  and proprietary to TouchNet Information Systems, Inc.
-# *
-# ******************************************************************************
-# *
-# * $LastChangedBy: kientzle $
-# * $Locker: $
-# * $ProjectName: $
-# * $ProjectRevision: $
-# * $LastChangedRevision: 29 $
-# * $LastChangedDate: 2008-05-05 18:10:33 -0400 (Mon, 05 May 2008) $
-# * $State$
-# * $RCSfile$
-# * $Source$
-# *
-# * Change Log:
-# * $Log: $
-# *
-# */
-
-.SUFFIXES : .c .cpp .obm
-
-ZLIB_INCL=\3rdParty\ZLib\Current\Include
-
-EXTRA_DEFINES=/DLIBARCHIVE_STATIC=1
-
-!ifdef DEBUG
-DEST_PATH=.\lib\mvcpp\debug
-OBJ_DIR=obj\debug
-COMPILE_FLAG=/MTd /DDEBUG=1 $(EXTRA_DEFINES) /Zi /Fd$(OBJ_DIR)\libarchive.pdb
-!else
-DEST_PATH=.\lib\mvcpp
-OBJ_DIR=obj
-COMPILE_FLAG=/MT $(EXTRA_DEFINES) /Fd$(OBJ_DIR)\libarchive.pdb
-!endif
-
-INCLUDE=.;$(MSDEVDIR)\INCLUDE;$(ZLIB_INCL);
-INCLUDE_OPTS=
-
-NT_CPP=cl
-NT_C=cl
-NT_LIBRARIAN=lib
-
-###
-NT_C_OPTS=$(COMPILE_FLAG) /GX /Zl /Zp1 /nologo /c /G5 /Oi /Ot /TC /DVC_EXTRANLEAN /DWIN32_LEAN_AND_MEAN $(INCLUDE_OPTS)
-NT_CPP_OPTS=$(COMPILE_FLAG) /GX /Zl /Zp1 /nologo /c /G5 /Oi /Ot /TP /DVC_EXTRANLEAN /DWIN32_LEAN_AND_MEAN $(INCLUDE_OPTS)
-NT_LIB_OPTS=
-
-.cpp{$(OBJ_DIR)}.obm:
-      -md $(OBJ_DIR) > nul 2>nul
-      $(NT_CPP) $(NT_CPP_OPTS) -Fo$*.obm $<
-
-.c{$(OBJ_DIR)}.obm:
-      -md $(OBJ_DIR) > nul 2>nul
-      $(NT_C) $(NT_C_OPTS) -Fo$*.obm $<
-
-
-OBJS=\
-  $(OBJ_DIR)\archive_check_magic.obm      $(OBJ_DIR)\archive_entry.obm \
-  $(OBJ_DIR)\archive_entry_copy_stat.obm  $(OBJ_DIR)\archive_entry_link_resolver.obm \
-  $(OBJ_DIR)\archive_entry_stat.obm       $(OBJ_DIR)\archive_entry_strmode.obm \
-  $(OBJ_DIR)\archive_read.obm             $(OBJ_DIR)\archive_read_data_into_fd.obm \
-  $(OBJ_DIR)\archive_read_extract.obm     $(OBJ_DIR)\archive_read_open_fd.obm \
-  $(OBJ_DIR)\archive_read_open_file.obm   $(OBJ_DIR)\archive_read_open_filename.obm \
-  $(OBJ_DIR)\archive_read_open_memory.obm $(OBJ_DIR)\archive_read_support_compression_all.obm \
-  $(OBJ_DIR)\archive_read_support_compression_bzip2.obm \
-  $(OBJ_DIR)\archive_read_support_compression_compress.obm \
-  $(OBJ_DIR)\archive_read_support_compression_gzip.obm \
-  $(OBJ_DIR)\archive_read_support_compression_none.obm \
-  $(OBJ_DIR)\archive_read_support_compression_program.obm \
-  $(OBJ_DIR)\archive_read_support_format_all.obm \
-  $(OBJ_DIR)\archive_read_support_format_ar.obm \
-  $(OBJ_DIR)\archive_read_support_format_cpio.obm \
-  $(OBJ_DIR)\archive_read_support_format_empty.obm \
-  $(OBJ_DIR)\archive_read_support_format_iso9660.obm \
-  $(OBJ_DIR)\archive_read_support_format_mtree.obm \
-  $(OBJ_DIR)\archive_read_support_format_tar.obm \
-  $(OBJ_DIR)\archive_read_support_format_zip.obm \
-  $(OBJ_DIR)\archive_string.obm                        $(OBJ_DIR)\archive_string_sprintf.obm \
-  $(OBJ_DIR)\archive_util.obm                          $(OBJ_DIR)\archive_virtual.obm \
-  $(OBJ_DIR)\archive_write.obm                         $(OBJ_DIR)\archive_write_disk.obm \
-  $(OBJ_DIR)\archive_write_disk_set_standard_lookup.obm \
-  $(OBJ_DIR)\archive_write_open_fd.obm                 $(OBJ_DIR)\archive_write_open_file.obm \
-  $(OBJ_DIR)\archive_write_open_filename.obm           $(OBJ_DIR)\archive_write_open_memory.obm \
-  $(OBJ_DIR)\archive_write_set_compression_bzip2.obm   $(OBJ_DIR)\archive_write_set_compression_compress.obm \
-  $(OBJ_DIR)\archive_write_set_compression_gzip.obm    $(OBJ_DIR)\archive_write_set_compression_none.obm \
-  $(OBJ_DIR)\archive_write_set_compression_program.obm $(OBJ_DIR)\archive_write_set_format.obm \
-  $(OBJ_DIR)\archive_write_set_format_ar.obm           $(OBJ_DIR)\archive_write_set_format_by_name.obm \
-  $(OBJ_DIR)\archive_write_set_format_cpio.obm         $(OBJ_DIR)\archive_write_set_format_cpio_newc.obm \
-  $(OBJ_DIR)\archive_write_set_format_pax.obm          $(OBJ_DIR)\archive_write_set_format_shar.obm \
-  $(OBJ_DIR)\archive_write_set_format_ustar.obm        $(OBJ_DIR)\filter_fork.obm \
-  $(OBJ_DIR)\libarchive-nonposix.obm
-
-all: CLEAN $(DEST_PATH)\libarchive.lib
-
-$(DEST_PATH)\libarchive.lib :: $(OBJS) $(DEST_PATH)
-
-$(DEST_PATH)\libarchive.lib ::
-    $(NT_LIBRARIAN) $(NT_LIB_OPTS) /OUT:$(DEST_PATH)\libarchive.lib $(OBJS) 
-
-$(DEST_PATH):
-    -md $(DEST_PATH) > nul 2>nul
-
-CLEAN:
-!ifdef CLEAN
-  -del $(OBJ_DIR)\*.pd? > nul 2>nul
-  -ren $(OBJ_DIR)\*.pdb *.pd1 > nul 2>nul
-  -ren $(OBJ_DIR)\*.pdb *.pd2 > nul 2>nul
-!endif
diff --git a/Utilities/cmlibarchive/build/windows/vc71/libarchive.sln b/Utilities/cmlibarchive/build/windows/vc71/libarchive.sln
deleted file mode 100644
index 962c497..0000000
--- a/Utilities/cmlibarchive/build/windows/vc71/libarchive.sln
+++ /dev/null
@@ -1,23 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libarchive", "libarchive.vcproj", "{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-    ProjectSection(ProjectDependencies) = postProject
-    EndProjectSection
-EndProject
-Global
-    GlobalSection(SolutionConfiguration) = preSolution
-        Debug = Debug
-        Release = Release
-    EndGlobalSection
-    GlobalSection(ProjectDependencies) = postSolution
-    EndGlobalSection
-    GlobalSection(ProjectConfiguration) = postSolution
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Debug.ActiveCfg = Debug|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Debug.Build.0 = Debug|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Release.ActiveCfg = Release|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Release.Build.0 = Release|Win32
-    EndGlobalSection
-    GlobalSection(ExtensibilityGlobals) = postSolution
-    EndGlobalSection
-    GlobalSection(ExtensibilityAddIns) = postSolution
-    EndGlobalSection
-EndGlobal
diff --git a/Utilities/cmlibarchive/build/windows/vc71/libarchive.vcproj b/Utilities/cmlibarchive/build/windows/vc71/libarchive.vcproj
deleted file mode 100644
index e09b896..0000000
--- a/Utilities/cmlibarchive/build/windows/vc71/libarchive.vcproj
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-    ProjectType="Visual C++"
-    Version="7.10"
-    Name="libarchive"
-    ProjectGUID="{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-    Keyword="Win32Proj">
-    <Platforms>
-        <Platform
-            Name="Win32"/>
-    </Platforms>
-    <Configurations>
-        <Configuration
-            Name="Debug|Win32"
-            OutputDirectory="Debug"
-            IntermediateDirectory="Debug"
-            ConfigurationType="4"
-            CharacterSet="2">
-            <Tool
-                Name="VCCLCompilerTool"
-                Optimization="0"
-                AdditionalIncludeDirectories=""
-                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;"
-                MinimalRebuild="TRUE"
-                BasicRuntimeChecks="3"
-                RuntimeLibrary="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                DebugInformationFormat="4"/>
-            <Tool
-                Name="VCCustomBuildTool"/>
-            <Tool
-                Name="VCLibrarianTool"
-                OutputFile="../../lib/$(ProjectName)-vc71-mt-d.lib"/>
-            <Tool
-                Name="VCMIDLTool"/>
-            <Tool
-                Name="VCPostBuildEventTool"/>
-            <Tool
-                Name="VCPreBuildEventTool"/>
-            <Tool
-                Name="VCPreLinkEventTool"/>
-            <Tool
-                Name="VCResourceCompilerTool"/>
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"/>
-            <Tool
-                Name="VCXMLDataGeneratorTool"/>
-            <Tool
-                Name="VCManagedWrapperGeneratorTool"/>
-            <Tool
-                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-        </Configuration>
-        <Configuration
-            Name="Release|Win32"
-            OutputDirectory="Release"
-            IntermediateDirectory="Release"
-            ConfigurationType="4"
-            CharacterSet="2">
-            <Tool
-                Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories=""
-                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;"
-                RuntimeLibrary="2"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                DebugInformationFormat="3"/>
-            <Tool
-                Name="VCCustomBuildTool"/>
-            <Tool
-                Name="VCLibrarianTool"
-                OutputFile="../../lib/$(ProjectName)-vc71-mt.lib"/>
-            <Tool
-                Name="VCMIDLTool"/>
-            <Tool
-                Name="VCPostBuildEventTool"/>
-            <Tool
-                Name="VCPreBuildEventTool"/>
-            <Tool
-                Name="VCPreLinkEventTool"/>
-            <Tool
-                Name="VCResourceCompilerTool"/>
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"/>
-            <Tool
-                Name="VCXMLDataGeneratorTool"/>
-            <Tool
-                Name="VCManagedWrapperGeneratorTool"/>
-            <Tool
-                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-        </Configuration>
-    </Configurations>
-    <References>
-    </References>
-    <Files>
-        <Filter
-            Name="Source Files"
-            Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-            UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-            <File
-                RelativePath="..\..\libarchive\archive_check_magic.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_copy_stat.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_link_resolver.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_stat.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_strmode.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_data_into_fd.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk_set_standard_lookup.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_extract.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_fd.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_file.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_filename.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_memory.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_all.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_bzip2.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_compress.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_gzip.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_lzma.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_none.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_program.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_all.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_ar.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_cpio.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_empty.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_iso9660.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_mtree.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_tar.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_zip.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string_sprintf.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_util.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_virtual.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_windows.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk_set_standard_lookup.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_fd.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_file.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_filename.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_memory.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_bzip2.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_compress.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_gzip.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_none.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_program.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_ar.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_by_name.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_cpio.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_cpio_newc.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_mtree.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_pax.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_shar.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_ustar.c">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\filter_fork.c">
-            </File>
-        </Filter>
-        <Filter
-            Name="Header Files"
-            Filter="h;hpp;hxx;hm;inl;inc;xsd"
-            UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-            <File
-                RelativePath="..\..\libarchive\archive.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_endian.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_private.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_platform.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_private.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk_private.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_private.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_windows.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk_private.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_private.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\config_windows.h">
-            </File>
-            <File
-                RelativePath="..\..\libarchive\filter_fork.h">
-            </File>
-        </Filter>
-        <Filter
-            Name="Resource Files"
-            Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-            UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-        </Filter>
-    </Files>
-    <Globals>
-    </Globals>
-</VisualStudioProject>
diff --git a/Utilities/cmlibarchive/build/windows/vc80/libarchive.sln b/Utilities/cmlibarchive/build/windows/vc80/libarchive.sln
deleted file mode 100644
index d6ee3c5..0000000
--- a/Utilities/cmlibarchive/build/windows/vc80/libarchive.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libarchive", "libarchive.vcproj", "{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libarchive_test", "libarchive_test\libarchive_test.vcproj", "{407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}"
-EndProject
-Global
-    GlobalSection(SolutionConfigurationPlatforms) = preSolution
-        Debug|Win32 = Debug|Win32
-        Release|Win32 = Release|Win32
-    EndGlobalSection
-    GlobalSection(ProjectConfigurationPlatforms) = postSolution
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Debug|Win32.ActiveCfg = Debug|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Debug|Win32.Build.0 = Debug|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Release|Win32.ActiveCfg = Release|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Release|Win32.Build.0 = Release|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Debug|Win32.ActiveCfg = Debug|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Debug|Win32.Build.0 = Debug|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Release|Win32.ActiveCfg = Release|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Release|Win32.Build.0 = Release|Win32
-    EndGlobalSection
-    GlobalSection(SolutionProperties) = preSolution
-        HideSolutionNode = FALSE
-    EndGlobalSection
-EndGlobal
diff --git a/Utilities/cmlibarchive/build/windows/vc80/libarchive.vcproj b/Utilities/cmlibarchive/build/windows/vc80/libarchive.vcproj
deleted file mode 100644
index 444de6d..0000000
--- a/Utilities/cmlibarchive/build/windows/vc80/libarchive.vcproj
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-    ProjectType="Visual C++"
-    Version="8.00"
-    Name="libarchive"
-    ProjectGUID="{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-    RootNamespace="libarchive"
-    Keyword="Win32Proj"
-    >
-    <Platforms>
-        <Platform
-            Name="Win32"
-        />
-    </Platforms>
-    <ToolFiles>
-    </ToolFiles>
-    <Configurations>
-        <Configuration
-            Name="Debug|Win32"
-            OutputDirectory="Debug"
-            IntermediateDirectory="Debug"
-            ConfigurationType="4"
-            InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-            CharacterSet="2"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                Optimization="0"
-                AdditionalIncludeDirectories=""
-                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;;LIBARCHIVE_STATIC"
-                MinimalRebuild="true"
-                BasicRuntimeChecks="3"
-                RuntimeLibrary="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="4"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLibrarianTool"
-                OutputFile="../../lib/$(ProjectName)-vc80-mt-d.lib"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-        <Configuration
-            Name="Release|Win32"
-            OutputDirectory="Release"
-            IntermediateDirectory="Release"
-            ConfigurationType="4"
-            InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-            CharacterSet="2"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories=""
-                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;;LIBARCHIVE_STATIC"
-                RuntimeLibrary="2"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                DebugInformationFormat="3"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLibrarianTool"
-                OutputFile="../../lib/$(ProjectName)-vc80-mt.lib"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-    </Configurations>
-    <References>
-    </References>
-    <Files>
-        <Filter
-            Name="Source Files"
-            Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-            UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-            >
-            <File
-                RelativePath="..\..\libarchive\archive_check_magic.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_copy_stat.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_link_resolver.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_stat.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_strmode.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_data_into_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk_set_standard_lookup.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_extract.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_file.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_filename.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_memory.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_all.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_bzip2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_compress.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_lzma.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_none.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_all.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_cpio.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_iso9660.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_mtree.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_tar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_zip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string_sprintf.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_util.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_virtual.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_windows.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk_set_standard_lookup.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_file.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_filename.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_memory.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_bzip2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_compress.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_none.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_by_name.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_cpio.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_cpio_newc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_mtree.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_pax.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_shar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_ustar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\filter_fork.c"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Header Files"
-            Filter="h;hpp;hxx;hm;inl;inc;xsd"
-            UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-            >
-            <File
-                RelativePath="..\..\libarchive\archive.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_endian.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_platform.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_windows.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\config_windows.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\filter_fork.h"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Resource Files"
-            Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-            UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-            >
-        </Filter>
-    </Files>
-    <Globals>
-    </Globals>
-</VisualStudioProject>
diff --git a/Utilities/cmlibarchive/build/windows/vc80/libarchive_test/libarchive_test.vcproj b/Utilities/cmlibarchive/build/windows/vc80/libarchive_test/libarchive_test.vcproj
deleted file mode 100644
index e1058fd..0000000
--- a/Utilities/cmlibarchive/build/windows/vc80/libarchive_test/libarchive_test.vcproj
+++ /dev/null
@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-    ProjectType="Visual C++"
-    Version="8.00"
-    Name="libarchive_test"
-    ProjectGUID="{407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}"
-    RootNamespace="libarchive_test"
-    Keyword="Win32Proj"
-    >
-    <Platforms>
-        <Platform
-            Name="Win32"
-        />
-    </Platforms>
-    <ToolFiles>
-    </ToolFiles>
-    <Configurations>
-        <Configuration
-            Name="Debug|Win32"
-            OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-            IntermediateDirectory="$(ConfigurationName)"
-            ConfigurationType="1"
-            CharacterSet="2"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                Optimization="0"
-                AdditionalIncludeDirectories="..\..\..\libarchive"
-                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LIBARCHIVE_STATIC"
-                MinimalRebuild="true"
-                BasicRuntimeChecks="3"
-                RuntimeLibrary="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="4"
-                CompileAs="1"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLinkerTool"
-                ShowProgress="0"
-                OutputFile="..\..\..\$(ProjectName).exe"
-                LinkIncremental="2"
-                GenerateDebugInformation="true"
-                SubSystem="1"
-                TargetMachine="1"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCManifestTool"
-                EmbedManifest="true"
-                SuppressStartupBanner="true"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCAppVerifierTool"
-            />
-            <Tool
-                Name="VCWebDeploymentTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-        <Configuration
-            Name="Release|Win32"
-            OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-            IntermediateDirectory="$(ConfigurationName)"
-            ConfigurationType="1"
-            CharacterSet="2"
-            WholeProgramOptimization="1"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="..\..\..\libarchive"
-                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LIBARCHIVE_STATIC"
-                RuntimeLibrary="2"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="3"
-                CompileAs="1"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLinkerTool"
-                OutputFile="..\..\..\$(ProjectName).exe"
-                LinkIncremental="1"
-                GenerateDebugInformation="true"
-                SubSystem="1"
-                OptimizeReferences="2"
-                EnableCOMDATFolding="2"
-                TargetMachine="1"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCManifestTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCAppVerifierTool"
-            />
-            <Tool
-                Name="VCWebDeploymentTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-    </Configurations>
-    <References>
-        <ProjectReference
-            ReferencedProjectIdentifier="{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-            CopyLocal="false"
-            CopyLocalDependencies="false"
-            CopyLocalSatelliteAssemblies="false"
-            RelativePathToProject=".\libarchive.vcproj"
-        />
-    </References>
-    <Files>
-        <Filter
-            Name="Source Files"
-            Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-            UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-            >
-            <File
-                RelativePath="..\..\..\libarchive\test\main.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\read_open_memory.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_acl_basic.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_acl_freebsd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_acl_pax.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_archive_api_feature.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_bad_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_bzip2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_gtar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_tar_hardlink.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_zip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_empty_write.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_entry.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_entry_strmode.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_fuzz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_link_resolver.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_pax_filename_encoding.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_compress_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_data_large.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_extract.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin_bz2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin_gz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin_Z.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_odc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_svr4_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_svr4c_Z.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_gtar_gz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_gtar_lzma.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_gtar_sparse.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_iso_gz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_isorr_bz2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_mtree.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_pax_bz2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tar_empty_filename.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tbz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tgz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_zip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_large.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_pax_truncated.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_position.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_truncated.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_tar_filenames.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_tar_large.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_ustar_filenames.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_compress.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_compress_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_hardlink.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_perms.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_secure.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_times.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio_newc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio_odc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_pax.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_shar_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_tar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_tar_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_tar_ustar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_open_memory.c"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Header Files"
-            Filter="h;hpp;hxx;hm;inl;inc;xsd"
-            UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-            >
-            <File
-                RelativePath="..\..\..\libarchive\test\list.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test.h"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Resource Files"
-            Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-            UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-            >
-        </Filter>
-    </Files>
-    <Globals>
-    </Globals>
-</VisualStudioProject>
diff --git a/Utilities/cmlibarchive/build/windows/vc90/libarchive.sln b/Utilities/cmlibarchive/build/windows/vc90/libarchive.sln
deleted file mode 100644
index 1ddfc98..0000000
--- a/Utilities/cmlibarchive/build/windows/vc90/libarchive.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libarchive", "libarchive.vcproj", "{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libarchive_test", "libarchive_test\libarchive_test.vcproj", "{407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}"
-EndProject
-Global
-    GlobalSection(SolutionConfigurationPlatforms) = preSolution
-        Debug|Win32 = Debug|Win32
-        Release|Win32 = Release|Win32
-    EndGlobalSection
-    GlobalSection(ProjectConfigurationPlatforms) = postSolution
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Debug|Win32.ActiveCfg = Debug|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Debug|Win32.Build.0 = Debug|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Release|Win32.ActiveCfg = Release|Win32
-        {0C758FDB-BE1D-47E9-8E18-9168AB34A308}.Release|Win32.Build.0 = Release|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Debug|Win32.ActiveCfg = Debug|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Debug|Win32.Build.0 = Debug|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Release|Win32.ActiveCfg = Release|Win32
-        {407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}.Release|Win32.Build.0 = Release|Win32
-    EndGlobalSection
-    GlobalSection(SolutionProperties) = preSolution
-        HideSolutionNode = FALSE
-    EndGlobalSection
-EndGlobal
diff --git a/Utilities/cmlibarchive/build/windows/vc90/libarchive.vcproj b/Utilities/cmlibarchive/build/windows/vc90/libarchive.vcproj
deleted file mode 100644
index 0946b71..0000000
--- a/Utilities/cmlibarchive/build/windows/vc90/libarchive.vcproj
+++ /dev/null
@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-    ProjectType="Visual C++"
-    Version="9.00"
-    Name="libarchive"
-    ProjectGUID="{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-    RootNamespace="libarchive"
-    Keyword="Win32Proj"
-    TargetFrameworkVersion="131072"
-    >
-    <Platforms>
-        <Platform
-            Name="Win32"
-        />
-    </Platforms>
-    <ToolFiles>
-    </ToolFiles>
-    <Configurations>
-        <Configuration
-            Name="Debug|Win32"
-            OutputDirectory="Debug"
-            IntermediateDirectory="Debug"
-            ConfigurationType="4"
-            InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-            CharacterSet="2"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                Optimization="0"
-                AdditionalIncludeDirectories=""
-                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;"
-                MinimalRebuild="true"
-                BasicRuntimeChecks="3"
-                RuntimeLibrary="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                DebugInformationFormat="4"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLibrarianTool"
-                OutputFile="../../lib/$(ProjectName)-vc90-mt-d.lib"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-        <Configuration
-            Name="Release|Win32"
-            OutputDirectory="Release"
-            IntermediateDirectory="Release"
-            ConfigurationType="4"
-            InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-            CharacterSet="2"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                InlineFunctionExpansion="1"
-                AdditionalIncludeDirectories=""
-                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;"
-                RuntimeLibrary="2"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                DebugInformationFormat="3"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLibrarianTool"
-                OutputFile="../../lib/$(ProjectName)-vc90-mt.lib"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-    </Configurations>
-    <References>
-    </References>
-    <Files>
-        <Filter
-            Name="Source Files"
-            Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-            UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-            >
-            <File
-                RelativePath="..\..\libarchive\archive_check_magic.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_copy_stat.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_link_resolver.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_stat.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_strmode.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_data_into_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk_set_standard_lookup.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_extract.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_file.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_filename.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_open_memory.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_all.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_bzip2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_compress.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_lzma.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_none.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_compression_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_all.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_cpio.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_iso9660.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_mtree.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_tar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_support_format_zip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string_sprintf.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_util.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_virtual.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_windows.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk_set_standard_lookup.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_file.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_filename.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_open_memory.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_bzip2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_compress.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_none.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_compression_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_by_name.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_cpio.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_cpio_newc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_mtree.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_pax.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_shar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_set_format_ustar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\filter_fork.c"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Header Files"
-            Filter="h;hpp;hxx;hm;inl;inc;xsd"
-            UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-            >
-            <File
-                RelativePath="..\..\libarchive\archive.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_endian.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_entry_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_platform.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_disk_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_read_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_string.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_windows.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_disk_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\archive_write_private.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\config_windows.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\libarchive\filter_fork.h"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Resource Files"
-            Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-            UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-            >
-        </Filter>
-    </Files>
-    <Globals>
-    </Globals>
-</VisualStudioProject>
diff --git a/Utilities/cmlibarchive/build/windows/vc90/libarchive_test/libarchive_test.vcproj b/Utilities/cmlibarchive/build/windows/vc90/libarchive_test/libarchive_test.vcproj
deleted file mode 100644
index 7fc3271..0000000
--- a/Utilities/cmlibarchive/build/windows/vc90/libarchive_test/libarchive_test.vcproj
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-    ProjectType="Visual C++"
-    Version="9.00"
-    Name="libarchive_test"
-    ProjectGUID="{407CA0B9-0CCB-4F02-A20B-CBBAEAAA2E4B}"
-    RootNamespace="libarchive_test"
-    Keyword="Win32Proj"
-    TargetFrameworkVersion="131072"
-    >
-    <Platforms>
-        <Platform
-            Name="Win32"
-        />
-    </Platforms>
-    <ToolFiles>
-    </ToolFiles>
-    <Configurations>
-        <Configuration
-            Name="Debug|Win32"
-            OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-            IntermediateDirectory="$(ConfigurationName)"
-            ConfigurationType="1"
-            CharacterSet="2"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                Optimization="0"
-                AdditionalIncludeDirectories="..\..\..\libarchive"
-                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LIBARCHIVE_STATIC"
-                MinimalRebuild="true"
-                BasicRuntimeChecks="3"
-                RuntimeLibrary="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="4"
-                CompileAs="1"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLinkerTool"
-                ShowProgress="0"
-                OutputFile="..\..\..\$(ProjectName).exe"
-                LinkIncremental="2"
-                GenerateDebugInformation="true"
-                SubSystem="1"
-                RandomizedBaseAddress="1"
-                DataExecutionPrevention="0"
-                TargetMachine="1"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCManifestTool"
-                EmbedManifest="true"
-                SuppressStartupBanner="true"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCAppVerifierTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-        <Configuration
-            Name="Release|Win32"
-            OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-            IntermediateDirectory="$(ConfigurationName)"
-            ConfigurationType="1"
-            CharacterSet="2"
-            WholeProgramOptimization="1"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="..\..\..\libarchive"
-                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LIBARCHIVE_STATIC"
-                RuntimeLibrary="2"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="3"
-                CompileAs="1"
-                DisableSpecificWarnings="4996"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLinkerTool"
-                OutputFile="..\..\..\$(ProjectName).exe"
-                LinkIncremental="1"
-                GenerateDebugInformation="true"
-                SubSystem="1"
-                OptimizeReferences="2"
-                EnableCOMDATFolding="2"
-                RandomizedBaseAddress="1"
-                DataExecutionPrevention="0"
-                TargetMachine="1"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCManifestTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCAppVerifierTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-    </Configurations>
-    <References>
-        <ProjectReference
-            ReferencedProjectIdentifier="{0C758FDB-BE1D-47E9-8E18-9168AB34A308}"
-            CopyLocal="false"
-            CopyLocalDependencies="false"
-            CopyLocalSatelliteAssemblies="false"
-            RelativePathToProject=".\libarchive.vcproj"
-        />
-    </References>
-    <Files>
-        <Filter
-            Name="Source Files"
-            Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-            UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-            >
-            <File
-                RelativePath="..\..\..\libarchive\test\main.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\read_open_memory.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_acl_basic.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_acl_freebsd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_acl_pax.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_archive_api_feature.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_bad_fd.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_bzip2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_gtar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_tar_hardlink.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_compat_zip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_empty_write.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_entry.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_entry_strmode.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_fuzz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_link_resolver.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_pax_filename_encoding.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_compress_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_data_large.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_extract.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin_bz2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin_gz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_bin_Z.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_odc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_svr4_gzip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_cpio_svr4c_Z.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_gtar_gz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_gtar_lzma.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_gtar_sparse.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_iso_gz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_isorr_bz2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_mtree.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_pax_bz2.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tar_empty_filename.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tbz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tgz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_tz.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_format_zip.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_large.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_pax_truncated.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_position.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_read_truncated.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_tar_filenames.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_tar_large.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_ustar_filenames.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_compress.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_compress_program.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_hardlink.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_perms.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_secure.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_disk_times.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_ar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio_newc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_cpio_odc.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_pax.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_shar_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_tar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_tar_empty.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_format_tar_ustar.c"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test_write_open_memory.c"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Header Files"
-            Filter="h;hpp;hxx;hm;inl;inc;xsd"
-            UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-            >
-            <File
-                RelativePath="..\..\..\libarchive\test\list.h"
-                >
-            </File>
-            <File
-                RelativePath="..\..\..\libarchive\test\test.h"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="Resource Files"
-            Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-            UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-            >
-        </Filter>
-    </Files>
-    <Globals>
-    </Globals>
-</VisualStudioProject>
diff --git a/Utilities/cmlibarchive/build/windows/wccpp.nt b/Utilities/cmlibarchive/build/windows/wccpp.nt
deleted file mode 100644
index 2c6c730..0000000
--- a/Utilities/cmlibarchive/build/windows/wccpp.nt
+++ /dev/null
@@ -1,107 +0,0 @@
-#/* FILE: wccpp.nt
-# *
-# *          Copyright (c) 2008
-# *          TouchNet Information Systems, Inc.
-# *          All Rights Reserved
-# *
-# *  This program is an unpublished copyright work of TouchNet Information
-# *  Systems, Inc. of Lenexa, KS.  The program, all information disclosed
-# *  and the matter shown and described hereon or herewith are confidential
-# *  and proprietary to TouchNet Information Systems, Inc.
-# *
-# ******************************************************************************
-# *
-# * $LastChangedBy: kientzle $
-# * $Locker: $
-# * $ProjectName: $
-# * $ProjectRevision: $
-# * $LastChangedRevision: 29 $
-# * $LastChangedDate: 2008-05-05 18:10:33 -0400 (Mon, 05 May 2008) $
-# * $State$
-# * $RCSfile$
-# * $Source$
-# *
-# * Change Log:
-# * $Log: $
-# *
-# */
-
-.EXTENSIONS:
-.EXTENSIONS: .obn .cpp .c
-
-ZLIB_INCL=\3rdParty\ZLib\Current\Include
-
-!ifdef DEBUG
-DEST_PATH=.\lib\wccpp\debug
-OBJ_DIR=obj\debug
-EXT_COMPILE_FLAG=-d2 -DLIBARCHIVE_STATIC=1
-!else
-DEST_PATH=.\lib\wccpp
-OBJ_DIR=obj
-EXT_COMPILE_FLAG=-DLIBARCHIVE_STATIC=1
-!endif
-
-# ----- NT compiler options -----------------------------------------------
-NT_CPP=wpp386
-NT_C=wcc386
-NT_LIBRARIAN=wlib
-
-
-###
-INCLUDE_OPTS=/I.;$(%watcom)\h;$(%watcom)\h\nt;$(ZLIB_INCL);
-NT_CPP_OPTS=-ei -wx -xs -xss -xst -od -of+ -zp1 -5 -bt=nt -bm $(EXT_COMPILE_FLAG) $(INCLUDE_OPTS) -DWIN32_LEAN_AND_MEAN
-NT_C_OPTS=-ei -wx -od -of+ -zp1 -5 -bt=nt -bm $(EXT_COMPILE_FLAG) $(INCLUDE_OPTS) -DWIN32_LEAN_AND_MEAN
-NT_LIB_OPTS=
-
-.cpp{$(OBJ_DIR)}.obn:
-      -md $(OBJ_DIR) > nul 2>nul
-      $(NT_CPP) $(NT_CPP_OPTS) -zp1 -fo=$*.obn $<
-
-.c{$(OBJ_DIR)}.obn:
-      -md $(OBJ_DIR) > nul 2>nul
-      $(NT_C) $(NT_C_OPTS) -zp1 -fo=$*.obn $<
-
-OBJS = &
-  $(OBJ_DIR)\archive_check_magic.obn      $(OBJ_DIR)\archive_entry.obn &
-  $(OBJ_DIR)\archive_entry_copy_stat.obn  $(OBJ_DIR)\archive_entry_link_resolver.obn &
-  $(OBJ_DIR)\archive_entry_stat.obn       $(OBJ_DIR)\archive_entry_strmode.obn &
-  $(OBJ_DIR)\archive_read.obn             $(OBJ_DIR)\archive_read_data_into_fd.obn &
-  $(OBJ_DIR)\archive_read_extract.obn     $(OBJ_DIR)\archive_read_open_fd.obn &
-  $(OBJ_DIR)\archive_read_open_file.obn   $(OBJ_DIR)\archive_read_open_filename.obn &
-  $(OBJ_DIR)\archive_read_open_memory.obn $(OBJ_DIR)\archive_read_support_compression_all.obn &
-  $(OBJ_DIR)\archive_read_support_compression_bzip2.obn &
-  $(OBJ_DIR)\archive_read_support_compression_compress.obn &
-  $(OBJ_DIR)\archive_read_support_compression_gzip.obn &
-  $(OBJ_DIR)\archive_read_support_compression_none.obn &
-  $(OBJ_DIR)\archive_read_support_compression_program.obn &
-  $(OBJ_DIR)\archive_read_support_format_all.obn &
-  $(OBJ_DIR)\archive_read_support_format_ar.obn &
-  $(OBJ_DIR)\archive_read_support_format_cpio.obn &
-  $(OBJ_DIR)\archive_read_support_format_empty.obn &
-  $(OBJ_DIR)\archive_read_support_format_iso9660.obn &
-  $(OBJ_DIR)\archive_read_support_format_mtree.obn &
-  $(OBJ_DIR)\archive_read_support_format_tar.obn &
-  $(OBJ_DIR)\archive_read_support_format_zip.obn &
-  $(OBJ_DIR)\archive_string.obn                        $(OBJ_DIR)\archive_string_sprintf.obn &
-  $(OBJ_DIR)\archive_util.obn                          $(OBJ_DIR)\archive_virtual.obn &
-  $(OBJ_DIR)\archive_write.obn                         $(OBJ_DIR)\archive_write_disk.obn &
-  $(OBJ_DIR)\archive_write_disk_set_standard_lookup.obn &
-  $(OBJ_DIR)\archive_write_open_fd.obn                 $(OBJ_DIR)\archive_write_open_file.obn &
-  $(OBJ_DIR)\archive_write_open_filename.obn           $(OBJ_DIR)\archive_write_open_memory.obn &
-  $(OBJ_DIR)\archive_write_set_compression_bzip2.obn   $(OBJ_DIR)\archive_write_set_compression_compress.obn &
-  $(OBJ_DIR)\archive_write_set_compression_gzip.obn    $(OBJ_DIR)\archive_write_set_compression_none.obn &
-  $(OBJ_DIR)\archive_write_set_compression_program.obn $(OBJ_DIR)\archive_write_set_format.obn &
-  $(OBJ_DIR)\archive_write_set_format_ar.obn           $(OBJ_DIR)\archive_write_set_format_by_name.obn &
-  $(OBJ_DIR)\archive_write_set_format_cpio.obn         $(OBJ_DIR)\archive_write_set_format_cpio_newc.obn &
-  $(OBJ_DIR)\archive_write_set_format_pax.obn          $(OBJ_DIR)\archive_write_set_format_shar.obn &
-  $(OBJ_DIR)\archive_write_set_format_ustar.obn        $(OBJ_DIR)\filter_fork.obn &
-  $(OBJ_DIR)\libarchive-nonposix.obn
-
-$(DEST_PATH)\LibArchive.lib :: $(OBJS) $(DEST_PATH)
-
-$(DEST_PATH)\LibArchive.lib ::
-    -md $(DEST_PATH) > nul 2>nul
-    $(NT_LIBRARIAN) $@ -+ $(OBJS)
-
-$(DEST_PATH):
-    -md $(DEST_PATH) > nul 2>nul