[cmake-commits] hoffman committed cmCPackTGZGenerator.cxx 1.13.2.3 1.13.2.4 cmCPackTarCompressGenerator.cxx 1.3.2.5 1.3.2.6 cpack.cxx 1.16.2.6 1.16.2.7

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	cmCPackTGZGenerator.cxx cmCPackTarCompressGenerator.cxx 
	cpack.cxx 
Log Message:
ENH: merge in stuff from head


Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -d -r1.13.2.3 -r1.13.2.4
--- cmCPackTGZGenerator.cxx	30 Oct 2006 16:36:07 -0000	1.13.2.3
+++ cmCPackTGZGenerator.cxx	25 Oct 2007 18:03:49 -0000	1.13.2.4
@@ -228,17 +228,23 @@
   std::auto_ptr<char> realNamePtr(realName);
   strcpy(realName, outFileName);
   int flags = O_WRONLY | O_CREAT;
+  int options = 0;
+  if(this->GeneratorVerbose)
+    {
+    options != TAR_VERBOSE;
+    }
+#ifdef __CYGWIN__
+  options |= TAR_GNU;
+#endif 
   if (tar_open(&t, realName,
       &gztype,
       flags, 0644,
-      (this->GeneratorVerbose?TAR_VERBOSE:0)
-      | 0) == -1)
+      options) == -1)
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
       << strerror(errno) << std::endl);
     return 0;
     }
-
   std::vector<std::string>::const_iterator fileIt;
   for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
     {

Index: cpack.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cpack.cxx,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -u -d -r1.16.2.6 -r1.16.2.7
--- cpack.cxx	27 Oct 2006 20:01:49 -0000	1.16.2.6
+++ cpack.cxx	25 Oct 2007 18:03:49 -0000	1.16.2.7
@@ -253,7 +253,7 @@
       if ( !globalMF->ReadListFile(0, cpackConfigFile.c_str()) )
         {
         cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
-          "Problem reding CPack config file: \""
+          "Problem reading CPack config file: \""
           << cpackConfigFile.c_str() << "\"" << std::endl);
         return 1;
         }

Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -d -r1.3.2.5 -r1.3.2.6
--- cmCPackTarCompressGenerator.cxx	17 May 2007 18:41:52 -0000	1.3.2.5
+++ cmCPackTarCompressGenerator.cxx	25 Oct 2007 18:03:49 -0000	1.3.2.6
@@ -175,15 +175,21 @@
   std::auto_ptr<char> realNamePtr(realName);
   strcpy(realName, outFileName);
   int flags = O_WRONLY | O_CREAT;
+  int options = 0;
+  if(this->GeneratorVerbose)
+    {
+    options != TAR_VERBOSE;
+    }
+#ifdef __CYGWIN__
+  options |= TAR_GNU;
+#endif
   if (tar_open(&t, realName,
-      &compressType,
-      flags, 0644,
-      (this->GeneratorVerbose?TAR_VERBOSE:0)
-      | 0) == -1)
+               &compressType,
+               flags, 0644, options) == -1)
       {
-    cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
-      << strerror(errno) << std::endl);
-    return 0;
+      cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
+                    << strerror(errno) << std::endl);
+      return 0;
       }
 
   std::vector<std::string>::const_iterator fileIt;