Permalink
Browse files

Environment::osDisplayName() now recognized Windows 8/Server 2012

  • Loading branch information...
1 parent 4914cb0 commit 295325d697c86a9a92e7986f22d7cfe6c03192e2 @obiltschnig obiltschnig committed Jan 11, 2013
View
@@ -10,6 +10,7 @@ Release 1.4.6 (2013-01-10)
- fixed SF# 603 count() is missing in HashMap
- Crypto and NetSSL_OpenSSL project files now use OpenSSL *MD.lib library files for
static_md builds. Previously, the DLL import libs were used.
+- Poco::Environment::osDisplayName() now recognized Windows 8/Server 2012
Release 1.4.5 (2012-11-19)
@@ -1794,4 +1795,4 @@ building the libraries.
--
-$Id: //poco/1.4/dist/CHANGELOG#72 $
+$Id: //poco/1.4/dist/CHANGELOG#73 $
@@ -1,7 +1,7 @@
//
// Environment.h
//
-// $Id: //poco/1.4/Foundation/include/Poco/Environment.h#2 $
+// $Id: //poco/1.4/Foundation/include/Poco/Environment.h#3 $
//
// Library: Foundation
// Package: Core
@@ -81,7 +81,7 @@ class Foundation_API Environment
/// Currently this is only implemented for
/// Windows. There it will return names like
/// "Windows XP" or "Windows 7/Server 2008 SP2".
- /// On other platform, returns the same as
+ /// On other platforms, returns the same as
/// osName().
static std::string osVersion();
@@ -1,7 +1,7 @@
//
// Environment_WIN32.cpp
//
-// $Id: //poco/1.4/Foundation/src/Environment_WIN32.cpp#2 $
+// $Id: //poco/1.4/Foundation/src/Environment_WIN32.cpp#3 $
//
// Library: Foundation
// Package: Core
@@ -108,6 +108,8 @@ std::string EnvironmentImpl::osDisplayNameImpl()
return "Windows Vista/Server 2008";
case 1:
return "Windows 7/Server 2008 SP2";
+ case 2:
+ return "Windows 8/Server 2012";
default:
return "Unknown";
}
@@ -1,7 +1,7 @@
//
// Environment_WIN32U.cpp
//
-// $Id: //poco/1.4/Foundation/src/Environment_WIN32U.cpp#2 $
+// $Id: //poco/1.4/Foundation/src/Environment_WIN32U.cpp#3 $
//
// Library: Foundation
// Package: Core
@@ -117,7 +117,9 @@ std::string EnvironmentImpl::osDisplayNameImpl()
case 0:
return "Windows Vista/Server 2008";
case 1:
- return "Windows 7/Server 2008 SP2";
+ return "Windows 7/Server 2008 R2";
+ case 2:
+ return "Windows 8/Server 2012";
default:
return "Unknown";
}
@@ -1,7 +1,7 @@
//
// PageCompiler.cpp
//
-// $Id: //poco/1.4/PageCompiler/src/PageCompiler.cpp#4 $
+// $Id: //poco/1.4/PageCompiler/src/PageCompiler.cpp#5 $
//
// A compiler that compiler HTML pages containing JSP directives into C++ classes.
//
@@ -226,7 +226,7 @@ class CompilerApp: public Application
helpFormatter.setHeader(
"\n"
"The POCO C++ Server Page Compiler.\n"
- "Copyright (c) 2008-2012 by Applied Informatics Software Engineering GmbH.\n"
+ "Copyright (c) 2008-2013 by Applied Informatics Software Engineering GmbH.\n"
"All rights reserved.\n\n"
"This program compiles web pages containing embedded C++ code "
"into a C++ class that can be used with the HTTP server "
@@ -1,5 +1,5 @@
#
-# $Id: //poco/1.4/build/config/Darwin-clang#4 $
+# $Id: //poco/1.4/build/config/Darwin-clang#5 $
#
# Darwin
#
@@ -20,6 +20,9 @@ POCO_TARGET_OSARCH ?= x86_64
POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH)
+ifeq ($(POCO_TARGET_OSARCH),i386)
+RORELOCS = -read_only_relocs suppress
+endif
#
# Tools
@@ -30,7 +33,7 @@ LINK = $(CXX) -bind_at_load
LIB = libtool -static -o
RANLIB = ranlib
SHLIB = $(CXX) -dynamiclib -o $@
-DYLIB = $(CXX) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@
+DYLIB = $(CXX) -dynamic -bundle $(RORELOCS) -Wl,-bind_at_load -o $@
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.clang
View
@@ -0,0 +1,80 @@
+#
+# $Id: //poco/1.4/build/config/Darwin-gcc#2 $
+#
+# Darwin
+#
+# Build settings for Mac OS X 10.6 (GCC 4.2)
+# The build settings defined in this file are compatible
+# with XCode 3.2.5 C++ projects.
+#
+# NOTE: This build configuration will build 64-bit binaries.
+# Use the Darwin32 build configuration to build 32-bit binaries.
+#
+
+#
+# General Settings
+#
+LINKMODE ?= SHARED
+
+POCO_TARGET_OSARCH ?= x86_64
+POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
+ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH)
+
+ifeq ($(POCO_TARGET_OSARCH),i386)
+RORELOCS = -read_only_relocs suppress
+endif
+
+#
+# Tools
+#
+CC = gcc
+CXX = g++
+LINK = $(CXX) -bind_at_load
+LIB = libtool -static -o
+RANLIB = ranlib
+SHLIB = $(CXX) -dynamiclib -o $@
+DYLIB = $(CXX) -dynamic -bundle $(RORELOCS) -bind_at_load -o $@
+SHLIBLN = $(POCO_BASE)/build/script/shlibln
+STRIP =
+DEP = $(POCO_BASE)/build/script/makedepend.gcc
+SHELL = sh
+RM = rm -rf
+CP = cp
+MKDIR = mkdir -p
+
+#
+# Extension for Shared Libraries
+#
+SHAREDLIBEXT = .$(target_version).dylib
+SHAREDLIBLINKEXT = .dylib
+
+#
+# Compiler and Linker Flags
+#
+CFLAGS = $(ARCHFLAGS)
+CXXFLAGS = $(ARCHFLAGS) -Wall -Wno-sign-compare
+LINKFLAGS = $(ARCHFLAGS)
+SHLIBFLAGS = $(ARCHFLAGS)
+DYLIBFLAGS = $(ARCHFLAGS)
+STATICOPT_CC =
+STATICOPT_CXX =
+STATICOPT_LINK =
+SHAREDOPT_CC = -fPIC
+SHAREDOPT_CXX = -fPIC
+SHAREDOPT_LINK =
+DEBUGOPT_CC = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL)
+DEBUGOPT_CXX = -O0 -g -gdwarf-2 -D_DEBUG=$(DEBUGLEVEL) -mfix-and-continue -fvisibility-inlines-hidden -fasm-blocks
+DEBUGOPT_LINK =
+RELEASEOPT_CC = -DNDEBUG -Os
+RELEASEOPT_CXX = -DNDEBUG -Os -fvisibility-inlines-hidden -fasm-blocks
+RELEASEOPT_LINK =
+
+#
+# System Specific Flags
+#
+SYSFLAGS = -DPOCO_HAVE_IPv6
+
+#
+# System Specific Libraries
+#
+SYSLIBS = -ldl
@@ -12,6 +12,7 @@ AAAIntroduction
- fixed SF# 603: count() is missing in HashMap
- Crypto and NetSSL_OpenSSL project files now use OpenSSL *MD.lib library files for
static_md builds. Previously, the DLL import libs were used.
+ - Poco::Environment::osDisplayName() now recognized Windows 8/Server 2012
!!!Release 1.4.5

0 comments on commit 295325d

Please sign in to comment.