From a401a4448dc4da0b65cc2a53996eeaaeb209b324 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Sun, 9 Jun 2013 08:46:54 -0500 Subject: [PATCH] update version information to 0.3.0-alpha1 --- CMakeLists.txt | 4 +- Doxyfile | 2 +- changelog.md | 2 +- readme.md | 2 +- websocketpp/common.hpp | 148 -------------------------------------- websocketpp/endpoint.hpp | 3 +- websocketpp/utilities.hpp | 2 +- websocketpp/version.hpp | 42 +++++++++++ 8 files changed, 49 insertions(+), 156 deletions(-) delete mode 100644 websocketpp/common.hpp create mode 100644 websocketpp/version.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index ab7d3cec3..878c7eaed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ project (websocketpp) cmake_minimum_required (VERSION 2.6) set (WEBSOCKETPP_MAJOR_VERSION 0) -set (WEBSOCKETPP_MINOR_VERSION 2) -set (WEBSOCKETPP_PATCH_VERSION 99) +set (WEBSOCKETPP_MINOR_VERSION 3) +set (WEBSOCKETPP_PATCH_VERSION 0) set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION}) set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") diff --git a/Doxyfile b/Doxyfile index 26e11b334..07a3dc5d4 100644 --- a/Doxyfile +++ b/Doxyfile @@ -33,7 +33,7 @@ PROJECT_NAME = "websocketpp" # if some version control system is used. -PROJECT_NUMBER = "0.3.0-dev" +PROJECT_NUMBER = "0.3.0-alpha1" # Using the PROJECT_BRIEF tag one can provide an optional one line description diff --git a/changelog.md b/changelog.md index 24056ba8b..0f1766dcc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,2 @@ -0.3.0b1 - 2013-05-?? +0.3.0-alpha1 - 2013-06-09 - Initial Release \ No newline at end of file diff --git a/readme.md b/readme.md index 8dfaadaeb..7fdd54776 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -WebSocket++ (0.3.x branch) +WebSocket++ (0.3.0-alpha1) ========================== WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket diff --git a/websocketpp/common.hpp b/websocketpp/common.hpp deleted file mode 100644 index 31d2bf11c..000000000 --- a/websocketpp/common.hpp +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2013, Peter Thorson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the WebSocket++ Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef WEBSOCKETPP_COMMON_HPP -#define WEBSOCKETPP_COMMON_HPP - -// TODO/NOTE: -// _WEBSOCKETPP_CPP11_MEMORY_ and _WEBSOCKETPP_CPP11_FUNCTIONAL_ presently -// only work if either both or neither is defined. It might not make sense to -// have separate options for them both. -// - - -/** - * _WEBSOCKETPP_CPP11_STL_ enables the use of a C++11 STL. Doing this requires - * that you link to a C++11 STL, that your copy of boost be linked to that same - * STL, and that your compiler supports a minimum set of C++11 features. - * - * Required Features: - * - noexcept - */ - -// Optional C++11 support features -#ifndef __has_feature // Optional of course. - #define __has_feature(x) 0 // Compatibility with non-clang compilers. -#endif -#ifndef __has_extension - #define __has_extension __has_feature // Compatibility with pre-3.0 compilers. -#endif - -// Enable initializer lists on clang when available. -#if __has_feature(cxx_generalized_initializers) - #define _WEBSOCKETPP_INITIALIZER_LISTS_ -#endif - -// Enable deleted functions when available. -#if __has_feature(cxx_deleted_functions) - #define _WEBSOCKETPP_DELETED_FUNCTIONS_ -#endif - -// Enable rvalue references when available. -#if __has_feature(cxx_rvalue_references) - #define _WEBSOCKETPP_RVALUE_REFERENCES_ -#endif - -// Use C++11 native Alias Templates instead of a hack. -//#define _WEBSOCKETPP_CPP11_ALIAS_TEMPLATES_ - -#ifdef _WEBSOCKETPP_CPP11_ - #define _WEBSOCKETPP_DELETED_FUNCTIONS_ - #define _WEBSOCKETPP_RVALUE_REFERENCES_ -#endif - -#include - -namespace websocketpp { - -// Size of the transport read buffer. Increasing may improve performance for -// large reads. Higher values will increase memory usage linearly with -// connection count. - -const size_t DEFAULT_READ_THRESHOLD = 1; // 512 would be a more sane value - -// Maximum size in bytes before rejecting an HTTP header as too big. -// Is defined in websocketpp/http/constants.hpp - -// Default user agent. - - - - - -} - -namespace close { -namespace status { - enum value { - INVALID_END = 999, - NORMAL = 1000, - GOING_AWAY = 1001, - PROTOCOL_ERROR = 1002, - UNSUPPORTED_DATA = 1003, - RSV_ADHOC_1 = 1004, - NO_STATUS = 1005, - ABNORMAL_CLOSE = 1006, - INVALID_PAYLOAD = 1007, - POLICY_VIOLATION = 1008, - MESSAGE_TOO_BIG = 1009, - EXTENSION_REQUIRE = 1010, - INTERNAL_ENDPOINT_ERROR = 1011, - RSV_ADHOC_2 = 1012, - RSV_ADHOC_3 = 1013, - RSV_ADHOC_4 = 1014, - TLS_HANDSHAKE = 1015, - RSV_START = 1016, - RSV_END = 2999, - INVALID_START = 5000 - }; - - inline bool reserved(value s) { - return ((s >= RSV_START && s <= RSV_END) || s == RSV_ADHOC_1 - || s == RSV_ADHOC_2 || s == RSV_ADHOC_3 || s == RSV_ADHOC_4); - } - - // Codes invalid on the wire - inline bool invalid(value s) { - return ((s <= INVALID_END || s >= INVALID_START) || - s == NO_STATUS || - s == ABNORMAL_CLOSE || - s == TLS_HANDSHAKE); - } - - // TODO functions for application ranges? -} // namespace status -} // namespace close - - - -#include -#include -#include -#include - -#endif // WEBSOCKETPP_COMMON_HPP diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp index 6e0812747..b18812b41 100644 --- a/websocketpp/endpoint.hpp +++ b/websocketpp/endpoint.hpp @@ -30,14 +30,13 @@ #include #include +#include #include #include namespace websocketpp { -static const char user_agent[] = "WebSocket++/0.3.0dev"; - /// Creates and manages connections associated with a WebSocket endpoint template class endpoint : public config::transport_type, public config::endpoint_base { diff --git a/websocketpp/utilities.hpp b/websocketpp/utilities.hpp index bdc2a43fd..3c266cac1 100644 --- a/websocketpp/utilities.hpp +++ b/websocketpp/utilities.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Peter Thorson. All rights reserved. + * Copyright (c) 2013, Peter Thorson. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/websocketpp/version.hpp b/websocketpp/version.hpp new file mode 100644 index 000000000..2049ab2ce --- /dev/null +++ b/websocketpp/version.hpp @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2013, Peter Thorson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the WebSocket++ Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef WEBSOCKETPP_VERSION_HPP +#define WEBSOCKETPP_VERSION_HPP + +namespace websocketpp { + +static int const major_version = 0; +static int const minor_version = 3; +static int const patch_version = 0; +static char const prerelease_flag[] = "alpha1"; + +static char const user_agent[] = "WebSocket++/0.3.0-alpha1"; + +} // namespace websocketpp + +#endif // WEBSOCKETPP_VERSION_HPP \ No newline at end of file