[Cmake-commits] [cmake-commits] hoffman committed System.c 1.11 1.11.2.1 SystemInformation.cxx 1.22 1.22.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	System.c SystemInformation.cxx 
Log Message:
ENH: merge from cvs create yikes RC 10! (I hope this is the last RC...)


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C 2 -d -r1.22 -r1.22.2.1
*** SystemInformation.cxx	3 Feb 2008 13:20:11 -0000	1.22
--- SystemInformation.cxx	1 May 2008 16:35:40 -0000	1.22.2.1
***************
*** 1964,1977 ****
            switch (this->ChipID.Model) 
              {
!             case 1: sprintf (this->ChipID.ProcessorName,"Athlon™ (0.25 micron)"); break;
!             case 2: sprintf (this->ChipID.ProcessorName,"Athlon™ (0.18 micron)"); break;
!             case 3: sprintf (this->ChipID.ProcessorName,"Duron™ (SF core)"); break;
!             case 4: sprintf (this->ChipID.ProcessorName,"Athlon™ (Thunderbird core)"); break;
!             case 6: sprintf (this->ChipID.ProcessorName,"Athlon™ (Palomino core)"); break;
!             case 7: sprintf (this->ChipID.ProcessorName,"Duron™ (Morgan core)"); break;
              case 8: 
                if (this->Features.ExtendedFeatures.SupportsMP)
!                 sprintf (this->ChipID.ProcessorName,"Athlon™ MP (Thoroughbred core)"); 
!               else sprintf (this->ChipID.ProcessorName,"Athlon™ XP (Thoroughbred core)");
                break;
              default: sprintf (this->ChipID.ProcessorName,"Unknown K7 family"); return false;
--- 1964,1977 ----
            switch (this->ChipID.Model) 
              {
!             case 1: sprintf (this->ChipID.ProcessorName,"Athlon- (0.25 micron)"); break;
!             case 2: sprintf (this->ChipID.ProcessorName,"Athlon- (0.18 micron)"); break;
!             case 3: sprintf (this->ChipID.ProcessorName,"Duron- (SF core)"); break;
!             case 4: sprintf (this->ChipID.ProcessorName,"Athlon- (Thunderbird core)"); break;
!             case 6: sprintf (this->ChipID.ProcessorName,"Athlon- (Palomino core)"); break;
!             case 7: sprintf (this->ChipID.ProcessorName,"Duron- (Morgan core)"); break;
              case 8: 
                if (this->Features.ExtendedFeatures.SupportsMP)
!                 sprintf (this->ChipID.ProcessorName,"Athlon - MP (Thoroughbred core)"); 
!               else sprintf (this->ChipID.ProcessorName,"Athlon - XP (Thoroughbred core)");
                break;
              default: sprintf (this->ChipID.ProcessorName,"Unknown K7 family"); return false;

Index: System.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/System.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C 2 -d -r1.11 -r1.11.2.1
*** System.c	13 Jan 2008 21:36:20 -0000	1.11
--- System.c	1 May 2008 16:35:40 -0000	1.11.2.1
***************
*** 76,79 ****
--- 76,86 ----
  
  /*--------------------------------------------------------------------------*/
+ static int kwsysSystem_Shell__CharNeedsQuotesOnWindows(char c)
+ {
+   return ((c == '\'') || (c == '#') || (c == '&') ||
+           (c == '<') || (c == '>') || (c == '|') || (c == '^'));
+ }
+ 
+ /*--------------------------------------------------------------------------*/
  static int kwsysSystem_Shell__CharNeedsQuotes(char c, int isUnix, int flags)
  {
***************
*** 100,111 ****
    else
      {
!     /* On Windows single-quotes must be escaped in some make
!        environments, such as in mingw32-make.  */
!     if(flags & kwsysSystem_Shell_Flag_Make)
        {
!       if(c == '\'')
!         {
!         return 1;
!         }
        }
      }
--- 107,114 ----
    else
      {
!     /* On Windows several special characters need quotes to preserve them.  */
!     if(kwsysSystem_Shell__CharNeedsQuotesOnWindows(c))
        {
!       return 1;
        }
      }
***************
*** 381,384 ****
--- 384,391 ----
            }
  
+         /* The make variable reference eliminates any escaping needed
+            for preceding backslashes.  */
+         windows_backslashes = 0;
+ 
          /* Stop if we have reached the end of the string.  */
          if(!*c)