[Cmake-commits] [cmake-commits] hoffman committed DynamicLoader.cxx 1.22.10.1 1.22.10.2 DynamicLoader.hxx.in 1.10 1.10.16.1 ProcessUNIX.c 1.71.2.3 1.71.2.4 SystemInformation.cxx 1.22.2.4 1.22.2.5 SystemTools.cxx 1.222.2.4 1.222.2.5 testDynamicLoader.cxx 1.22 1.22.2.1 testProcess.c 1.34 1.34.44.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 24 11:18:58 EDT 2008
Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv25234/Source/kwsys
Modified Files:
Tag: CMake-2-6
DynamicLoader.cxx DynamicLoader.hxx.in ProcessUNIX.c
SystemInformation.cxx SystemTools.cxx testDynamicLoader.cxx
testProcess.c
Log Message:
ENH: merge in changes for 2.6.3 RC 1
Index: DynamicLoader.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/DynamicLoader.hxx.in,v
retrieving revision 1.10
retrieving revision 1.10.16.1
diff -C 2 -d -r1.10 -r1.10.16.1
*** DynamicLoader.hxx.in 6 Jun 2007 15:26:06 -0000 1.10
--- DynamicLoader.hxx.in 24 Oct 2008 15:18:55 -0000 1.10.16.1
***************
*** 26,29 ****
--- 26,31 ----
#include <mach-o/dyld.h>
#endif
+ #elif defined(__HAIKU__)
+ #include <os/kernel/image.h>
#elif defined(__BEOS__)
#include <be/kernel/image.h>
Index: testDynamicLoader.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/testDynamicLoader.cxx,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C 2 -d -r1.22 -r1.22.2.1
*** testDynamicLoader.cxx 24 Nov 2007 01:45:49 -0000 1.22
--- testDynamicLoader.cxx 24 Oct 2008 15:18:55 -0000 1.22.2.1
***************
*** 18,25 ****
#include KWSYS_HEADER(stl/string)
! #if defined(__BEOS__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
// Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers.
--- 18,29 ----
#include KWSYS_HEADER(stl/string)
! #if defined(__BEOS__) && !defined(__HAIKU__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
+ #if defined(__HAIKU__)
+ #include <os/kernel/OS.h> /* disable_debugger() API. */
+ #endif
+
// Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers.
***************
*** 95,99 ****
#if defined(_WIN32)
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
! #elif defined(__BEOS__)
disable_debugger(1);
#endif
--- 99,103 ----
#if defined(_WIN32)
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
! #elif defined(__BEOS__) || defined(__HAIKU__)
disable_debugger(1);
#endif
Index: testProcess.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/testProcess.c,v
retrieving revision 1.34
retrieving revision 1.34.44.1
diff -C 2 -d -r1.34 -r1.34.44.1
*** testProcess.c 4 Dec 2006 19:42:47 -0000 1.34
--- testProcess.c 24 Oct 2008 15:18:55 -0000 1.34.44.1
***************
*** 35,39 ****
#endif
! #if defined(__BEOS__) && !defined(__ZETA__)
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h>
--- 35,39 ----
#endif
! #if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h>
***************
*** 88,92 ****
/* Avoid error diagnostic popups since we are crashing on purpose. */
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
! #elif defined(__BEOS__)
/* Avoid error diagnostic popups since we are crashing on purpose. */
disable_debugger(1);
--- 88,92 ----
/* Avoid error diagnostic popups since we are crashing on purpose. */
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
! #elif defined(__BEOS__) || defined(__HAIKU__)
/* Avoid error diagnostic popups since we are crashing on purpose. */
disable_debugger(1);
Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.71.2.3
retrieving revision 1.71.2.4
diff -C 2 -d -r1.71.2.3 -r1.71.2.4
*** ProcessUNIX.c 3 Sep 2008 13:43:19 -0000 1.71.2.3
--- ProcessUNIX.c 24 Oct 2008 15:18:55 -0000 1.71.2.4
***************
*** 64,67 ****
--- 64,71 ----
#include <ctype.h> /* isspace */
+ #ifdef __HAIKU__
+ #undef __BEOS__
+ #endif
+
#if defined(KWSYS_C_HAS_PTRDIFF_T) && KWSYS_C_HAS_PTRDIFF_T
typedef ptrdiff_t kwsysProcess_ptrdiff_t;
***************
*** 76,80 ****
#endif
! #if defined(__BEOS__) && !defined(__ZETA__)
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h>
--- 80,84 ----
#endif
! #if defined(__BEOS__) && !defined(__ZETA__)
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h>
Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -C 2 -d -r1.22.2.4 -r1.22.2.5
*** SystemInformation.cxx 13 Jun 2008 12:55:18 -0000 1.22.2.4
--- SystemInformation.cxx 24 Oct 2008 15:18:55 -0000 1.22.2.5
***************
*** 14,17 ****
--- 14,21 ----
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
+ #ifdef _WIN32
+ # include <winsock.h> // WSADATA, include before sys/types.h
+ #endif
+
#include "kwsysPrivate.h"
#include KWSYS_HEADER(FundamentalType.h)
***************
*** 2148,2152 ****
if ( !fd )
{
! kwsys_ios::cout << "Problem opening /proc/cpuinfo" << kwsys_stl::endl;
return 0;
}
--- 2152,2156 ----
if ( !fd )
{
! kwsys_ios::cout << "Problem opening /proc/cpuinfo" << kwsys_ios::endl;
return 0;
}
***************
*** 2280,2284 ****
if( errorFlag!=0 )
{
! kwsys_ios::cout << "Problem calling uname(): " << strerror(errno) << kwsys_stl::endl;
return 0;
}
--- 2284,2288 ----
if( errorFlag!=0 )
{
! kwsys_ios::cout << "Problem calling uname(): " << strerror(errno) << kwsys_ios::endl;
return 0;
}
***************
*** 2304,2308 ****
if ( !fd )
{
! kwsys_ios::cout << "Problem opening /proc/meminfo" << kwsys_stl::endl;
return 0;
}
--- 2308,2312 ----
if ( !fd )
{
! kwsys_ios::cout << "Problem opening /proc/meminfo" << kwsys_ios::endl;
return 0;
}
***************
*** 2811,2815 ****
// Should not get here.
kwsys_ios::cerr << "Unexpected ending state after running " << args[0]
! << kwsys_stl::endl;
} break;
}
--- 2815,2819 ----
// Should not get here.
kwsys_ios::cerr << "Unexpected ending state after running " << args[0]
! << kwsys_ios::endl;
} break;
}
***************
*** 2981,2993 ****
if (osvi.wProductType == VER_NT_WORKSTATION)
{
! // VER_SUITE_PERSONAL may not be defined
! #ifdef VER_SUITE_PERSONAL
! if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
{
! this->OSRelease += " Personal";
}
! else
{
! this->OSRelease += " Professional";
}
#endif
--- 2985,3004 ----
if (osvi.wProductType == VER_NT_WORKSTATION)
{
! if (osvi.dwMajorVersion == 6)
{
! this->OSRelease = "Vista";
}
! // VER_SUITE_PERSONAL may not be defined
! #ifdef VER_SUITE_PERSONAL
! else
{
! if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
! {
! this->OSRelease += " Personal";
! }
! else
! {
! this->OSRelease += " Professional";
! }
}
#endif
***************
*** 3016,3020 ****
}
! sprintf (operatingSystem, "%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
--- 3027,3031 ----
}
! sprintf (operatingSystem, "%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
***************
*** 3096,3100 ****
{
// Windows 2000 and everything else.
! sprintf (operatingSystem,"%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
--- 3107,3111 ----
{
// Windows 2000 and everything else.
! sprintf (operatingSystem,"%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
Index: DynamicLoader.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/DynamicLoader.cxx,v
retrieving revision 1.22.10.1
retrieving revision 1.22.10.2
diff -C 2 -d -r1.22.10.1 -r1.22.10.2
*** DynamicLoader.cxx 13 Jun 2008 12:55:18 -0000 1.22.10.1
--- DynamicLoader.cxx 24 Oct 2008 15:18:55 -0000 1.22.10.2
***************
*** 336,344 ****
// ---------------------------------------------------------------
! // 4. Implementation for BeOS
! #ifdef __BEOS__
#include <string.h> // for strerror()
#include <be/kernel/image.h>
#include <be/support/Errors.h>
#define DYNAMICLOADER_DEFINED 1
--- 336,354 ----
// ---------------------------------------------------------------
! // 4. Implementation for BeOS / Haiku
! #if defined __BEOS__ || defined(__HAIKU__)
!
#include <string.h> // for strerror()
+
+ #ifdef __BEOS__
#include <be/kernel/image.h>
#include <be/support/Errors.h>
+ #endif
+
+ #ifdef __HAIKU__
+ #include <os/kernel/image.h>
+ #include <os/support/Errors.h>
+ #endif
+
#define DYNAMICLOADER_DEFINED 1
Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.222.2.4
retrieving revision 1.222.2.5
diff -C 2 -d -r1.222.2.4 -r1.222.2.5
*** SystemTools.cxx 29 May 2008 13:15:32 -0000 1.222.2.4
--- SystemTools.cxx 24 Oct 2008 15:18:55 -0000 1.222.2.5
***************
*** 132,136 ****
#endif
! #if defined(__BEOS__) && !defined(__ZETA__)
#include <be/kernel/OS.h>
#include <be/storage/Path.h>
--- 132,141 ----
#endif
! #if defined(__HAIKU__)
! #include <os/kernel/OS.h>
! #include <os/storage/Path.h>
! #endif
!
! #if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
#include <be/kernel/OS.h>
#include <be/storage/Path.h>
***************
*** 3383,3387 ****
/**
* Return file extension of a full filename (dot included).
! * Warning: this is the shortest extension (for example: .tar.gz)
*/
kwsys_stl::string SystemTools::GetFilenameLastExtension(const kwsys_stl::string& filename)
--- 3388,3392 ----
/**
* Return file extension of a full filename (dot included).
! * Warning: this is the shortest extension (for example: .gz of .tar.gz)
*/
kwsys_stl::string SystemTools::GetFilenameLastExtension(const kwsys_stl::string& filename)
***************
*** 4166,4169 ****
--- 4171,4190 ----
// Test for the specific product family.
+ if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
+ {
+ #if (_MSC_VER >= 1300)
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ {
+ res += "Microsoft Windows Vista";
+ }
+ else
+ {
+ res += "Microsoft Windows Server 2008 family";
+ }
+ #else
+ res += "Microsoft Windows Vista or Windows Server 2008";
+ #endif
+ }
+
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
{
***************
*** 4199,4209 ****
res += " Workstation 4.0";
}
! else if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
! {
! res += " Home Edition";
! }
! else
{
! res += " Professional";
}
}
--- 4220,4233 ----
res += " Workstation 4.0";
}
! else if (osvi.dwMajorVersion == 5)
{
! if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
! {
! res += " Home Edition";
! }
! else
! {
! res += " Professional";
! }
}
}
***************
*** 4249,4253 ****
}
! else // Windows NT 4.0
{
if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
--- 4273,4277 ----
}
! else if (osvi.dwMajorVersion <= 4) // Windows NT 4.0
{
if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
More information about the Cmake-commits
mailing list