From d64f5a387c4c2837fd8e52f2a45ab7ff3afa9b1f Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 24 Mar 2014 09:26:55 -0700 Subject: [PATCH] Add beast SConstruct and .travis.yml --- .travis.yml | 26 +++ Builds/VisualStudio2013/beast.vcxproj | 8 +- Builds/VisualStudio2013/beast.vcxproj.filters | 12 +- SConstruct | 158 ++++++++++++++++++ beast/asio/tests/bind_handler.test.cpp | 2 + beast/asio/wrap_handler.h | 2 +- beast/chrono/tests/abstract_clock.test.cpp | 2 + beast/crypto/Crypto.cpp | 3 +- beast/crypto/UnsignedIntegerCalc.h | 2 + ...ryEncoding.test.cpp => BinaryEncoding.cpp} | 1 + beast/http/HTTP.cpp | 2 +- beast/http/impl/joyent_parser.cpp | 4 + .../{ParsedURL.test.cpp => ParsedURL.cpp} | 0 beast/net/DynamicBuffer.h | 1 + beast/net/IPAddress.h | 1 + beast/net/impl/IPAddressV4.cpp | 7 +- beast/net/impl/IPAddressV6.cpp | 14 +- beast/net/tests/IPEndpoint.test.cpp | 2 + beast/threads/Threads.cpp | 2 +- beast/threads/impl/Thread.cpp | 4 + ...ServiceQueue.test.cpp => ServiceQueue.cpp} | 0 beast/unit_test/tests/main.cpp | 57 +++++++ beast/utility/tests/hardened_hash.test.cpp | 2 + scripts/BeastConfig.h | 154 ----------------- scripts/compile.sh | 29 ---- tests.sh | 11 ++ 26 files changed, 305 insertions(+), 201 deletions(-) create mode 100644 .travis.yml create mode 100644 SConstruct rename beast/crypto/tests/{BinaryEncoding.test.cpp => BinaryEncoding.cpp} (98%) rename beast/http/tests/{ParsedURL.test.cpp => ParsedURL.cpp} (100%) rename beast/threads/tests/{ServiceQueue.test.cpp => ServiceQueue.cpp} (100%) create mode 100644 beast/unit_test/tests/main.cpp delete mode 100644 scripts/BeastConfig.h delete mode 100755 scripts/compile.sh create mode 100644 tests.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..a322d54864 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +language: cpp + +compiler: + - gcc + - clang +before_install: + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo add-apt-repository -y ppa:boost-latest/ppa + - sudo apt-get update -qq + - sudo apt-get install -qq python-software-properties + - sudo apt-get install -qq g++-4.8 + - sudo apt-get install -qq libboost1.55-all-dev + - sudo apt-get install -qq libssl-dev + - sudo apt-get install -qq gcc-4.8 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 40 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8 + - sudo update-alternatives --set gcc /usr/bin/gcc-4.8 +# - sudo apt-get -y install binutils-gold + - g++ -v + - clang -v +script: + # Abort build on failure + - set -e + - scons +notifications: + email: + false diff --git a/Builds/VisualStudio2013/beast.vcxproj b/Builds/VisualStudio2013/beast.vcxproj index 8384d49f6f..47b7b51153 100644 --- a/Builds/VisualStudio2013/beast.vcxproj +++ b/Builds/VisualStudio2013/beast.vcxproj @@ -479,7 +479,7 @@ true true - + true true true @@ -690,6 +690,12 @@ true + + true + true + true + true + true true diff --git a/Builds/VisualStudio2013/beast.vcxproj.filters b/Builds/VisualStudio2013/beast.vcxproj.filters index b80da828cd..fd8abd157b 100644 --- a/Builds/VisualStudio2013/beast.vcxproj.filters +++ b/Builds/VisualStudio2013/beast.vcxproj.filters @@ -300,6 +300,9 @@ {63c495fa-b6b2-42ed-8ae3-9f3582e76bf5} + + {8dc7ce09-9255-48c0-8a90-78a0f94d22c5} + @@ -1601,9 +1604,6 @@ beast\crypto\tests - - beast\crypto\tests - beast\utility\tests @@ -1634,6 +1634,12 @@ beast\utility\tests + + beast\crypto\tests + + + beast\unit_test\tests + diff --git a/SConstruct b/SConstruct new file mode 100644 index 0000000000..2c6df89d6a --- /dev/null +++ b/SConstruct @@ -0,0 +1,158 @@ +# Beast scons file +# +#------------------------------------------------------------------------------- + +import ntpath +import os +import sys +import textwrap +#import re +#import json +#import urlparse +#import posixpath +#import string +#import subprocess +#import platform +#import itertools + +#------------------------------------------------------------------------------- + +# Format a name value pair +def print_nv_pair(n, v): + name = ("%s" % n.rjust(10)) + sys.stdout.write("%s \033[94m%s\033[0m\n" % (name, v)) + +# Pretty-print values as a build configuration +def print_build_vars(env,var): + val = env.get(var, '') + + if val and val != '': + name = ("%s" % var.rjust(10)) + + wrapper = textwrap.TextWrapper() + wrapper.break_long_words = False + wrapper.break_on_hyphens = False + wrapper.width = 69 + + if type(val) is str: + lines = wrapper.wrap(val) + else: + lines = wrapper.wrap(" ".join(str(x) for x in val)) + + for line in lines: + print_nv_pair (name, line) + name = " " + +def print_build_config(env): + config_vars = ['CC', 'CXX', 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', + 'CXXFLAGS', 'LIBPATH', 'LINKFLAGS', 'LIBS'] + sys.stdout.write("\nConfiguration:\n") + for var in config_vars: + print_build_vars(env,var) + print + +def print_cmd_line(s, target, src, env): + target = (''.join([str(x) for x in target])) + source = (''.join([str(x) for x in src])) + name = target + print ' \033[94m' + name + '\033[0m' + +#------------------------------------------------------------------------------- + +# Returns the list of libraries needed by the test source file. This is +# accomplished by scanning the source file for a special comment line +# with this format, which must match exactly: +# +# // LIBS: ... +# +# path = path to source file +# +def get_libs(path): + prefix = '// LIBS:' + with open(path, 'rb') as f: + for line in f: + line = line.strip() + if line.startswith(prefix): + items = line.split(prefix, 1)[1].strip() + return [x.strip() for x in items.split(' ')] + +# Returns the list of source modules needed by the test source file. This +# +# // MODULES: ... +# +# path = path to source file +# +def get_mods(path): + prefix = '// MODULES:' + with open(path, 'rb') as f: + for line in f: + line = line.strip() + if line.startswith(prefix): + items = line.split(prefix, 1)[1].strip() + items = [os.path.normpath(os.path.join( + os.path.dirname(path), x.strip())) for + x in items.split(' ')] + return items + +# Build a stand alone executable that runs +# all the test suites in one source file +# +def build_test(env,path): + libs = get_libs(path) + mods = get_mods(path) + bin = os.path.basename(os.path.splitext(path)[0]) + bin = os.path.join ("bin", bin) + srcs = ['beast/unit_test/tests/main.cpp'] + srcs.append (path) + if mods: + srcs.extend (mods) + # All paths get normalized here, so we can use posix + # forward slashes for everything including on Windows + srcs = [os.path.normpath(os.path.join ('bin', x)) for x in srcs] + objs = [os.path.splitext(x)[0]+'.o' for x in srcs] + env_ = env + if libs: + env_.Append(LIBS = libs) + env_.Program (bin, srcs) + +#------------------------------------------------------------------------------- + +def main(): + env = Environment() + + env['PRINT_CMD_LINE_FUNC'] = print_cmd_line + + env.VariantDir (os.path.join ('bin', 'beast'), 'beast', duplicate=0) + env.VariantDir (os.path.join ('bin', 'modules'), 'modules', duplicate=0) + + # Copy important os environment variables into env + if os.environ.get ('CC', None): + env.Replace (CC = os.environ['CC']) + if os.environ.get ('CXX', None): + env.Replace (CXX = os.environ['CXX']) + if os.environ.get ('PATH', None): + env.Replace (PATH = os.environ['PATH']) + + # Set up boost variables + home = os.environ.get("BOOST_HOME", None) + if home is not None: + env.Prepend (CPPPATH = home) + env.Append (LIBPATH = os.path.join (home, 'stage', 'lib')) + + # Set up flags + env.Append(CXXFLAGS = [ + '-std=c++11', + '-frtti', + '-g' + ]) + + for root, dirs, files in os.walk('.'): + for path in files: + path = os.path.join(root,path) + if (path.endswith(".test.cpp")): + build_test(env,path) + + print_build_config (env) + +main() + diff --git a/beast/asio/tests/bind_handler.test.cpp b/beast/asio/tests/bind_handler.test.cpp index c9e8d5a7c7..34c1001aff 100644 --- a/beast/asio/tests/bind_handler.test.cpp +++ b/beast/asio/tests/bind_handler.test.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +// LIBS: boost_system + #if BEAST_INCLUDE_BEASTCONFIG #include "../../../BeastConfig.h" #endif diff --git a/beast/asio/wrap_handler.h b/beast/asio/wrap_handler.h index 8665ec8e05..02ee7895f9 100644 --- a/beast/asio/wrap_handler.h +++ b/beast/asio/wrap_handler.h @@ -24,7 +24,7 @@ #include #include -#include +#include "../cxx14/type_traits.h" // #include namespace beast { diff --git a/beast/chrono/tests/abstract_clock.test.cpp b/beast/chrono/tests/abstract_clock.test.cpp index 7cf098d1b0..e84925271b 100644 --- a/beast/chrono/tests/abstract_clock.test.cpp +++ b/beast/chrono/tests/abstract_clock.test.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +// MODULES: ../impl/chrono_io.cpp + #include "../abstract_clock.h" #include "../abstract_clock_io.h" #include "../manual_clock.h" diff --git a/beast/crypto/Crypto.cpp b/beast/crypto/Crypto.cpp index 327df57d50..206776e69d 100644 --- a/beast/crypto/Crypto.cpp +++ b/beast/crypto/Crypto.cpp @@ -25,5 +25,6 @@ #include "impl/Sha256.cpp" #include "impl/UnsignedInteger.cpp" -#include "tests/BinaryEncoding.test.cpp" +#include "tests/BinaryEncoding.cpp" + #include "tests/UnsignedInteger.test.cpp" diff --git a/beast/crypto/UnsignedIntegerCalc.h b/beast/crypto/UnsignedIntegerCalc.h index 05e0ff79d0..d4e1b8ac5e 100644 --- a/beast/crypto/UnsignedIntegerCalc.h +++ b/beast/crypto/UnsignedIntegerCalc.h @@ -22,9 +22,11 @@ #include "../ByteOrder.h" +#include #include #include #include +#include namespace beast { diff --git a/beast/crypto/tests/BinaryEncoding.test.cpp b/beast/crypto/tests/BinaryEncoding.cpp similarity index 98% rename from beast/crypto/tests/BinaryEncoding.test.cpp rename to beast/crypto/tests/BinaryEncoding.cpp index b85a2488f7..5be99858a9 100644 --- a/beast/crypto/tests/BinaryEncoding.test.cpp +++ b/beast/crypto/tests/BinaryEncoding.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +// MODULES: ../../../modules/beast_core/beast_core.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp #include "../BinaryEncoding.h" #include "../UnsignedInteger.h" diff --git a/beast/http/HTTP.cpp b/beast/http/HTTP.cpp index c8c010e94c..ed6997fe7a 100644 --- a/beast/http/HTTP.cpp +++ b/beast/http/HTTP.cpp @@ -26,4 +26,4 @@ #include "impl/joyent_parser.cpp" #include "impl/raw_parser.cpp" -#include "tests/ParsedURL.test.cpp" +#include "tests/ParsedURL.cpp" diff --git a/beast/http/impl/joyent_parser.cpp b/beast/http/impl/joyent_parser.cpp index edd2973290..07a3ae1abe 100644 --- a/beast/http/impl/joyent_parser.cpp +++ b/beast/http/impl/joyent_parser.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#include "../basic_message.h" + +#include + namespace beast { namespace joyent { diff --git a/beast/http/tests/ParsedURL.test.cpp b/beast/http/tests/ParsedURL.cpp similarity index 100% rename from beast/http/tests/ParsedURL.test.cpp rename to beast/http/tests/ParsedURL.cpp diff --git a/beast/net/DynamicBuffer.h b/beast/net/DynamicBuffer.h index 34d2a6d749..ef1c3cffea 100644 --- a/beast/net/DynamicBuffer.h +++ b/beast/net/DynamicBuffer.h @@ -20,6 +20,7 @@ #ifndef BEAST_NET_DYNAMICBUFFER_H_INCLUDED #define BEAST_NET_DYNAMICBUFFER_H_INCLUDED +#include #include namespace beast { diff --git a/beast/net/IPAddress.h b/beast/net/IPAddress.h index 325a10c633..1d9bb1edd1 100644 --- a/beast/net/IPAddress.h +++ b/beast/net/IPAddress.h @@ -27,6 +27,7 @@ #include #include #include +#include //------------------------------------------------------------------------------ diff --git a/beast/net/impl/IPAddressV4.cpp b/beast/net/impl/IPAddressV4.cpp index 468c770d8c..da2bf7f614 100644 --- a/beast/net/impl/IPAddressV4.cpp +++ b/beast/net/impl/IPAddressV4.cpp @@ -25,7 +25,8 @@ #include "../detail/Parse.h" #include - +#include + namespace beast { namespace IP { @@ -95,7 +96,7 @@ AddressV4::Proxy AddressV4::operator[] (std::size_t index) const switch (index) { default: - bassertfalse; + throw std::out_of_range ("bad array index"); case 0: return Proxy (24, &value); case 1: return Proxy (16, &value); case 2: return Proxy ( 8, &value); @@ -108,7 +109,7 @@ AddressV4::Proxy AddressV4::operator[] (std::size_t index) switch (index) { default: - bassertfalse; + throw std::out_of_range ("bad array index"); case 0: return Proxy (24, &value); case 1: return Proxy (16, &value); case 2: return Proxy ( 8, &value); diff --git a/beast/net/impl/IPAddressV6.cpp b/beast/net/impl/IPAddressV6.cpp index 3086228281..f079875dea 100644 --- a/beast/net/impl/IPAddressV6.cpp +++ b/beast/net/impl/IPAddressV6.cpp @@ -31,35 +31,35 @@ namespace IP { bool is_loopback (AddressV6 const&) { // VFALCO TODO - bassertfalse; + assert(false); return false; } bool is_unspecified (AddressV6 const&) { // VFALCO TODO - bassertfalse; + assert(false); return false; } bool is_multicast (AddressV6 const&) { // VFALCO TODO - bassertfalse; + assert(false); return false; } bool is_private (AddressV6 const&) { // VFALCO TODO - bassertfalse; + assert(false); return false; } bool is_public (AddressV6 const&) { // VFALCO TODO - bassertfalse; + assert(false); return false; } @@ -68,14 +68,14 @@ bool is_public (AddressV6 const&) std::string to_string (AddressV6 const&) { // VFALCO TODO - bassertfalse; + assert(false); return ""; } std::istream& operator>> (std::istream& is, AddressV6&) { // VFALCO TODO - bassertfalse; + assert(false); return is; } diff --git a/beast/net/tests/IPEndpoint.test.cpp b/beast/net/tests/IPEndpoint.test.cpp index 503aa67ede..e32784d2bf 100644 --- a/beast/net/tests/IPEndpoint.test.cpp +++ b/beast/net/tests/IPEndpoint.test.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +// MODULES: ../impl/IPEndpoint.cpp ../impl/IPAddressV4.cpp ../impl/IPAddressV6.cpp + #if BEAST_INCLUDE_BEASTCONFIG #include "../../BeastConfig.h" #endif diff --git a/beast/threads/Threads.cpp b/beast/threads/Threads.cpp index 283e0811e4..9335269710 100644 --- a/beast/threads/Threads.cpp +++ b/beast/threads/Threads.cpp @@ -28,4 +28,4 @@ #include "impl/WaitableEvent.cpp" #include "tests/Atomic.test.cpp" -#include "tests/ServiceQueue.test.cpp" +#include "tests/ServiceQueue.cpp" diff --git a/beast/threads/impl/Thread.cpp b/beast/threads/impl/Thread.cpp index 2aa08401bc..a9f0f8f5f8 100644 --- a/beast/threads/impl/Thread.cpp +++ b/beast/threads/impl/Thread.cpp @@ -440,6 +440,10 @@ void Thread::yield() #else +#include +#include +#include + #include #if BEAST_BSD // ??? diff --git a/beast/threads/tests/ServiceQueue.test.cpp b/beast/threads/tests/ServiceQueue.cpp similarity index 100% rename from beast/threads/tests/ServiceQueue.test.cpp rename to beast/threads/tests/ServiceQueue.cpp diff --git a/beast/unit_test/tests/main.cpp b/beast/unit_test/tests/main.cpp new file mode 100644 index 0000000000..340b44bfca --- /dev/null +++ b/beast/unit_test/tests/main.cpp @@ -0,0 +1,57 @@ +//------------------------------------------------------------------------------ +/* + This file is part of Beast: https://github.com/vinniefalco/Beast + Copyright 2013, Vinnie Falco + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#include "../../unit_test.h" +#include "../../streams/debug_ostream.h" + +#ifdef _MSC_VER +# ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN +# define WIN32_LEAN_AND_MEAN +# include +# undef WIN32_LEAN_AND_MEAN +# else +# include +# endif +#endif + +#include + +// Simple main used to produce stand +// alone executables that run unit tests. +int main() +{ + using namespace beast::unit_test; + +#ifdef _MSC_VER + { + int flags = _CrtSetDbgFlag (_CRTDBG_REPORT_FLAG); + flags |= _CRTDBG_LEAK_CHECK_DF; + _CrtSetDbgFlag (flags); + } +#endif + + { + beast::debug_ostream s; + reporter r (s); + bool failed (r.run_each (global_suites())); + if (failed) + return EXIT_FAILURE; + return EXIT_SUCCESS; + } +} diff --git a/beast/utility/tests/hardened_hash.test.cpp b/beast/utility/tests/hardened_hash.test.cpp index c7dcdedbab..c086137367 100644 --- a/beast/utility/tests/hardened_hash.test.cpp +++ b/beast/utility/tests/hardened_hash.test.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +// MODULES: ../../crypto/impl/Sha256.cpp + #if BEAST_INCLUDE_BEASTCONFIG #include "../../../BeastConfig.h" #endif diff --git a/scripts/BeastConfig.h b/scripts/BeastConfig.h deleted file mode 100644 index 4c8e9aa1c0..0000000000 --- a/scripts/BeastConfig.h +++ /dev/null @@ -1,154 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef BEAST_BEASTCONFIG_H_INCLUDED -#define BEAST_BEASTCONFIG_H_INCLUDED - -/** Configuration file for Beast. - This sets various configurable options for Beast. In order to compile you - must place a copy of this file in a location where your build environment - can find it, and then customize its contents to suit your needs. - @file BeastConfig.h -*/ - -//------------------------------------------------------------------------------ -// -// Diagnostics -// -//------------------------------------------------------------------------------ - -/** Config: BEAST_FORCE_DEBUG - Normally, BEAST_DEBUG is set to 1 or 0 based on compiler and project - settings, but if you define this value, you can override this to force it - to be true or false. -*/ -#ifndef BEAST_FORCE_DEBUG -//#define BEAST_FORCE_DEBUG 1 -#endif - -/** Config: BEAST_LOG_ASSERTIONS - If this flag is enabled, the the bassert and bassertfalse macros will always - use Logger::writeToLog() to write a message when an assertion happens. - Enabling it will also leave this turned on in release builds. When it's - disabled, however, the bassert and bassertfalse macros will not be compiled - in a release build. - @see bassert, bassertfalse, Logger -*/ -#ifndef BEAST_LOG_ASSERTIONS -//#define BEAST_LOG_ASSERTIONS 1 -#endif - -/** Config: BEAST_CHECK_MEMORY_LEAKS - Enables a memory-leak check for certain objects when the app terminates. - See the LeakChecked class for more details about enabling leak checking for - specific classes. -*/ -#ifndef BEAST_CHECK_MEMORY_LEAKS -//#define BEAST_CHECK_MEMORY_LEAKS 0 -#endif - -/** Config: BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES - Setting this option makes Socket-derived classes generate compile errors - if they forget any of the virtual overrides As some Socket-derived classes - intentionally omit member functions that are not applicable, this macro - should only be enabled temporarily when writing your own Socket-derived - class, to make sure that the function signatures match as expected. -*/ -#ifndef BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES -//#define BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES 1 -#endif - -/** Config: BEAST_CATCH_UNHANDLED_EXCEPTIONS - This will wrap thread entry points with an exception catching block. - A customizable hook is provided to get called when unhandled exceptions - are thrown. - @see ProtectedCall -*/ -#ifndef BEAST_CATCH_UNHANDLED_EXCEPTIONS -//#define BEAST_CATCH_UNHANDLED_EXCEPTIONS 1 -#endif - -//------------------------------------------------------------------------------ -// -// Libraries -// -//------------------------------------------------------------------------------ - -/** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES - In a Visual C++ build, this can be used to stop the required system libs - being automatically added to the link stage. -*/ -#ifndef BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES -//#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1 -#endif - -/** Config: BEAST_INCLUDE_ZLIB_CODE - This can be used to disable Beast's embedded 3rd-party zlib code. - You might need to tweak this if you're linking to an external zlib library - in your app, but for normal apps, this option should be left alone. - - If you disable this, you might also want to set a value for - BEAST_ZLIB_INCLUDE_PATH, to specify the path where your zlib headers live. -*/ -#ifndef BEAST_INCLUDE_ZLIB_CODE -//#define BEAST_INCLUDE_ZLIB_CODE 1 -#endif - -/** Config: BEAST_ZLIB_INCLUDE_PATH - This is included when BEAST_INCLUDE_ZLIB_CODE is set to zero. -*/ -#ifndef BEAST_ZLIB_INCLUDE_PATH -#define BEAST_ZLIB_INCLUDE_PATH -#endif - -/** Config: BEAST_FUNCTIONAL_USES_### - source configuration. - Set one of these to manually force a particular implementation of bind(). - If nothing is chosen then beast will use whatever is appropriate for your - environment based on what is available. - If you override these, set ONE to 1 and the rest to 0 -*/ -#ifndef BEAST_FUNCTIONAL_USES_STD -//#define BEAST_FUNCTIONAL_USES_STD 0 -#endif -#ifndef BEAST_FUNCTIONAL_USES_TR1 -//#define BEAST_FUNCTIONAL_USES_TR1 0 -#endif -#ifndef BEAST_FUNCTIONAL_USES_BOOST -//#define BEAST_FUNCTIONAL_USES_BOOST 0 -#endif - -//------------------------------------------------------------------------------ -// -// Boost -// -//------------------------------------------------------------------------------ - -/** Config: BEAST_USE_BOOST_FEATURES - This activates boost specific features and improvements. If this is - turned on, the include paths for your build environment must be set - correctly to find the boost headers. -*/ -#ifndef BEAST_USE_BOOST_FEATURES -//#define BEAST_USE_BOOST_FEATURES 1 -#endif - -//------------------------------------------------------------------------------ - -#endif diff --git a/scripts/compile.sh b/scripts/compile.sh deleted file mode 100755 index bb1f618d3d..0000000000 --- a/scripts/compile.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# This script makes sure that every directly includable header -# file compiles stand-alone for all supported platforms. -# - -for f in $1/*.h $1/*/*.h -do -{ - echo "Compilng '$f'" -g++ -xc++ - -c -o /dev/null <