[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1986-gd9ec849

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d9ec849ae7248f671d3e954eb41a68763cb2dcd4 (commit)
       via  a943b5c4f3ed700f53c554b9f91942ad57047c18 (commit)
      from  03df039502924398fe51ccd492ef4a5c93c86b71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9ec849ae7248f671d3e954eb41a68763cb2dcd4
commit d9ec849ae7248f671d3e954eb41a68763cb2dcd4
Merge: 03df039 a943b5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 7 10:13:05 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 10:13:05 2013 -0500

    Merge topic 'exit-without-working-directory' into next
    
    a943b5c Fail early if no current working directory exists


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a943b5c4f3ed700f53c554b9f91942ad57047c18
commit a943b5c4f3ed700f53c554b9f91942ad57047c18
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 7 08:53:50 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 7 08:53:50 2013 -0500

    Fail early if no current working directory exists
    
    Remove the old "nocwd" behavior that attempts to provide the "--help"
    output when no working directory is available.  The long help output
    scrolls the real error message out of typical terminal sizes.  Also
    execute as little code as possible when no working directory exists.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 0ba7322..b188918 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -180,7 +180,6 @@ int main (int argc, char *argv[])
 {
   cmSystemTools::FindExecutableDirectory(argv[0]);
   cmCPackLog log;
-  int nocwd = 0;
 
   log.SetErrorPrefix("CPack Error: ");
   log.SetWarningPrefix("CPack Warning: ");
@@ -193,7 +192,7 @@ int main (int argc, char *argv[])
     {
     cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
       "Current working directory cannot be established." << std::endl);
-    nocwd = 1;
+    return 1;
     }
 
   std::string generator;
@@ -297,7 +296,7 @@ int main (int argc, char *argv[])
    * should launch cpack using "cpackConfigFile" if it exists
    * in the current directory.
    */
-  if((doc.CheckOptions(argc, argv,"-G") || nocwd) && !(argc==1))
+  if((doc.CheckOptions(argc, argv,"-G")) && !(argc==1))
     {
       help = true;
     }
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 11a4267..4267841 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -344,19 +344,17 @@ int main(int ac, char** av)
 
 int do_cmake(int ac, char** av)
 {
-  int nocwd = 0;
-
   if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
     {
     std::cerr << "Current working directory cannot be established."
               << std::endl;
-    nocwd = 1;
+    return 1;
     }
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
   cmDocumentation doc;
   doc.addCMakeStandardDocSections();
-  if(doc.CheckOptions(ac, av, "-E") || nocwd)
+  if(doc.CheckOptions(ac, av, "-E"))
     {
     // Construct and print requested documentation.
     cmake hcm;
@@ -424,7 +422,7 @@ int do_cmake(int ac, char** av)
     return result;
     }
 #else
-  if ( nocwd || ac == 1 )
+  if ( ac == 1 )
     {
     std::cout <<
       "Bootstrap CMake should not be used outside CMake build process."
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index d650777..8de901a 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -273,14 +273,13 @@ int main (int argc, char *argv[])
     return cmCTestLaunch::Main(argc, argv);
     }
 
-  int nocwd = 0;
   cmCTest inst;
 
   if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
     {
     cmCTestLog(&inst, ERROR_MESSAGE,
       "Current working directory cannot be established." << std::endl);
-    nocwd = 1;
+    return 1;
     }
 
   // If there is a testing input file, check for documentation options
@@ -298,7 +297,7 @@ int main (int argc, char *argv[])
       }
     cmDocumentation doc;
     doc.addCTestStandardDocSections();
-    if(doc.CheckOptions(argc, argv) || nocwd)
+    if(doc.CheckOptions(argc, argv))
       {
       // Construct and print requested documentation.
       std::vector<cmDocumentationEntry> commands;

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cpack.cxx |    5 ++---
 Source/cmakemain.cxx   |    8 +++-----
 Source/ctest.cxx       |    5 ++---
 3 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake