Merge pull request XRPLF#231 from zaphoyd/experimental

bring cmake branch in line with experimental

.travis.yml

@@ -0,0 +1,21 @@
+language: cpp
+compiler:
+  - gcc
+before_install:
+ - sudo apt-get update -qq -y
+ - sudo apt-get install libboost1.48-all-dev -y
+env:
+  global:
+    - BOOST_INCLUDES=/usr/include
+    - BOOST_LIBS=/usr/lib
+script: scons && scons test
+branches:
+  only:
+    - experimental
+    - 0.3.x-cmake
+notifications:
+  recipients:
+    - travis@zaphoyd.com
+  email:
+    on_success: change
+    on_failure: always

COPYING

@@ -0,0 +1,23 @@
+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.

SConstruct

@@ -75,15 +75,15 @@ elif env['PLATFORM'] == 'posix':
       env.Append(CCFLAGS = ['-g', '-O0'])
    else:
       env.Append(CPPDEFINES = ['NDEBUG'])
-      env.Append(CCFLAGS = ['-O3', '-fomit-frame-pointer'])
+      env.Append(CCFLAGS = ['-O1', '-fomit-frame-pointer'])
    env.Append(CCFLAGS = ['-Wall'])
    #env['LINKFLAGS'] = ''
 elif env['PLATFORM'] == 'darwin':
    if env.has_key('DEBUG'):
       env.Append(CCFLAGS = ['-g', '-O0'])
    else:
       env.Append(CPPDEFINES = ['NDEBUG'])
-      env.Append(CCFLAGS = ['-O3', '-fomit-frame-pointer'])
+      env.Append(CCFLAGS = ['-O1', '-fomit-frame-pointer'])
    env.Append(CCFLAGS = ['-Wall'])
    #env['LINKFLAGS'] = ''
 

changelog.md

@@ -0,0 +1,2 @@
+0.3.0b1 - 2013-05-??
+- Initial Release

readme.md

@@ -0,0 +1,53 @@
+WebSocket++ (0.3.x branch)
+==========================
+
+WebSocket++ is a header only C++ library that impliments RFC6455 The WebSocket
+Protocol. It allows integrating WebSocket client and server functionality into
+C++ programs. It uses interchangable network transport modules including one
+based on C++ iostreams and one based on Boost Asio.
+
+*This branch is no longer "experimental". It represents the current edge release
+of the WebSocket++ library. The API of 0.3.x has some significant changes from
+0.2.x, so care should be taken when upgrading.*
+
+*This branch's API is relatively stable now. Features implimented so far are 
+unlikely to change (except where explicitly noted). New features will be added
+regularly until parity with the 0.2 branch is reached.*
+
+*This is the preferred branch for new projects, especially those that involve 
+multithreaded servers. It is better tested and documented. The 0.3.x API will 
+be the basis for the 1.0 release.*
+
+Major Features
+==============
+* Full support for RFC6455
+* Partial support for Hixie 76 / Hybi 00, 07-17 draft specs (server only)
+* Message/event based interface
+* Supports secure WebSockets (TLS), IPv6, and explicit proxies.
+* Flexible dependency management (C++11 Standard Library or Boost)
+* Interchangable network transport modules (iostream and Boost Asio)
+* Portible, cross platform and architecture design
+
+Get Involved
+============
+
+[![Build Status](https://travis-ci.org/zaphoyd/websocketpp.png)](https://travis-ci.org/zaphoyd/websocketpp)
+
+**Project Website**  
+http://www.zaphoyd.com/websocketpp/
+
+**User Manual**  
+http://www.zaphoyd.com/websocketpp/manual/
+
+**GitHub Repository**  
+https://github.com/zaphoyd/websocketpp/
+
+**Announcements Mailing List**  
+http://groups.google.com/group/websocketpp-announcements/
+
+**Discussion / Development / Support Mailing List / Forum**  
+http://groups.google.com/group/websocketpp/
+
+Author
+======
+Peter Thorson - websocketpp@zaphoyd.com

readme.txt → roadmap.md

@@ -1,17 +1,3 @@
-WebSocket++ 0.3.x branch
-
-This branch is no longer "experimental". It represents the current edge release
-of the WebSocket++ library. The API of 0.3.x has some significant changes from
-0.2.x, so care should be taken when upgrading.
-
-This branch's API is relatively stable now. Features implimented so far are 
-unlikely to change (except where explicitly noted). New features will be added
-regularly until parity with the 0.2 branch is reached.
-
-This is the preferred branch for new projects, especially those that involve 
-multithreaded servers. It is better tested and documented. The 0.3.x API will 
-be the basis for the 1.0 release.
-
 Complete & Tested:
 - Server and client roles pass all Autobahn v0.5.9 test suite tests strictly
 - Streaming UTF8 validation

test/transport/asio/SConscript

@@ -6,20 +6,23 @@ Import('env_cpp11')
 Import('boostlibs')
 Import('platform_libs')
 Import('polyfill_libs')
+Import('tls_libs')
 
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','regex'],env) + [platform_libs] + [tls_libs]
 
 objs = env.Object('base_boost.o', ["base.cpp"], LIBS = BOOST_LIBS)
-#objs += env.Object('utilities_boost.o', ["utilities.cpp"], LIBS = BOOST_LIBS)
+#objs += env.Object('timers_boost.o', ["timers.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS)
-#prgs += env.Program('test_utility_boost', ["utilities_boost.o"], LIBS = BOOST_LIBS)
+#prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS)
 
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
    objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
+   #objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_base_stl', ["base_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   #prgs += env_cpp11.Program('test_timers_stl', ["timers_stl.o"], LIBS = BOOST_LIBS_CPP11)
 
 Return('prgs')