ENH: move files from main tree to 2.4.1

4 files changed, 25 insertions, 7 deletions

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 2f5363d..31345f3 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -53,9 +53,19 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName,
       << std::endl);
     return false;
     }
+  std::string nsisInInstallOptions
+    = this->FindTemplate("NSIS.InstallOptions.ini.in");
+  if ( nsisInInstallOptions.size() == 0 )
+    {
+    cmCPackLogger(cmCPackLog::LOG_ERROR,
+      "CPack error: Could not find NSIS installer options file."
+      << std::endl);
+    return false;
+    }
   std::string nsisFileName = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
   std::string tmpFile = nsisFileName;
   tmpFile += "/NSISOutput.log";
+  std::string nsisInstallOptions = nsisFileName + "/NSIS.InstallOptions.ini";
   nsisFileName += "/project.nsi";
   cmOStringStream str;
   std::vector<std::string>::const_iterator it;
@@ -90,6 +100,7 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName,
 
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << nsisInFileName
     << " to " << nsisFileName << std::endl);
+  this->ConfigureFile(nsisInInstallOptions.c_str(), nsisInstallOptions.c_str());
   this->ConfigureFile(nsisInFileName.c_str(), nsisFileName.c_str());
   std::string nsisCmd = "\"";
   nsisCmd += this->GetOption("CPACK_INSTALLER_PROGRAM");
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 563c7b6..6f0fb72 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -56,6 +56,7 @@ void cmCTestGenericHandler::SetOption(const char* op, const char* value)
 //----------------------------------------------------------------------
 void cmCTestGenericHandler::SetPersistentOption(const char* op, const char* value)
 {
+  this->SetOption(op, value);
   if ( !op )
     {
     return;
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 9350334..736e38d 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -113,7 +113,7 @@ void cmCTestScriptHandler::Initialize()
   this->CTestRoot = "";
   this->CVSCheckOut = "";
   this->CTestCmd = "";
-  this->CVSCmd = "";
+  this->UpdateCmd = "";
   this->CTestEnv = "";
   this->InitCache = "";
   this->CMakeCmd = "";
@@ -389,8 +389,13 @@ int cmCTestScriptHandler::ExtractVariables()
     = this->Makefile->GetSafeDefinition("CTEST_CVS_CHECKOUT");
   this->CTestRoot
     = this->Makefile->GetSafeDefinition("CTEST_DASHBOARD_ROOT");
-  this->CVSCmd
+  this->UpdateCmd
+    = this->Makefile->GetSafeDefinition("CTEST_UPDATE_COMMAND");
+  if ( this->UpdateCmd.empty() )
+    {
+    this->UpdateCmd
     = this->Makefile->GetSafeDefinition("CTEST_CVS_COMMAND");
+    }
   this->CTestEnv
     = this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT");
   this->InitCache
@@ -420,7 +425,7 @@ int cmCTestScriptHandler::ExtractVariables()
     const char *updateVal = this->Makefile->GetDefinition(updateVar);
     if ( updateVal )
       {
-      if ( this->CVSCmd.empty() )
+      if ( this->UpdateCmd.empty() )
         {
         cmSystemTools::Error(updateVar,
           " specified without specifying CTEST_CVS_COMMAND.");
@@ -669,7 +674,7 @@ int cmCTestScriptHandler::PerformExtraUpdates()
   bool res;
 
   // do an initial cvs update as required
-  command = this->CVSCmd;
+  command = this->UpdateCmd;
   std::vector<cmStdString>::iterator it;
   for (it = this->ExtraUpdates.begin();
     it != this->ExtraUpdates.end();
@@ -684,14 +689,14 @@ int cmCTestScriptHandler::PerformExtraUpdates()
       fullCommand += cvsArgs[1];
       output = "";
       retVal = 0;
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run CVS: "
+      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run Update: "
         << fullCommand.c_str() << std::endl);
       res = cmSystemTools::RunSingleCommand(fullCommand.c_str(), &output,
         &retVal, cvsArgs[0].c_str(),
         this->HandlerVerbose, 0 /*this->TimeOut*/);
       if (!res || retVal != 0)
         {
-        cmSystemTools::Error("Unable to perform extra cvs updates:\n",
+        cmSystemTools::Error("Unable to perform extra updates:\n",
           output.c_str());
         return 0;
         }
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index e354005..503ddcc 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -45,6 +45,7 @@ class cmCTestCommand;
  *   CTEST_CONTINUOUS_MINIMUM_INTERVAL
  *   CTEST_CVS_CHECKOUT
  *   CTEST_CVS_COMMAND
+ *   CTEST_UPDATE_COMMAND
  *   CTEST_DASHBOARD_ROOT
  *   CTEST_ENVIRONMENT
  *   CTEST_INITIAL_CACHE
@@ -138,7 +139,7 @@ private:
   cmStdString CTestRoot;
   cmStdString CVSCheckOut;
   cmStdString CTestCmd;
-  cmStdString CVSCmd;
+  cmStdString UpdateCmd;
   cmStdString CTestEnv;
   cmStdString InitCache;
   cmStdString CMakeCmd;