ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-04 10:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change to the treatment of BeastConfig.h

Browse Source 
* No longer requires its own compiler include path
* Includes use relative paths to locate the file
* Client applications include the file themselves
* Inclusion of BeastConfig.h can be controlled via preprocessor directive
This commit is contained in:
Vinnie Falco
2014-03-17 18:20:31 -07:00
parent cad50c68a8
commit 3cb3e5273f
86 changed files with 105 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Builds/QtCreator/rippled.pro
View File

@@ -45,7 +45,6 @@ linux-g++:QMAKE_CXXFLAGS += \
-pthread
INCLUDEPATH += \
"../../src/BeastConfig/" \
"../../src/leveldb/" \
"../../src/leveldb/port" \
"../../src/leveldb/include" \

2
Builds/VisualStudio2013/RippleD.props
View File

@@ -14,7 +14,7 @@
<PreprocessorDefinitions>_VARIADIC_MAX=10;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(RepoDir)\src\BeastConfig;$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<ExceptionHandling>Async</ExceptionHandling>
<DisableSpecificWarnings>4018;4244</DisableSpecificWarnings>

2
Builds/VisualStudio2013/RippleD.vcxproj
View File

@@ -2234,7 +2234,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\BeastConfig\BeastConfig.h" />
<ClInclude Include="..\..\src\BeastConfig.h" />
<ClInclude Include="..\..\src\ripple\algorithm\api\CycledSet.h" />
<ClInclude Include="..\..\src\ripple\algorithm\api\DecayingSample.h" />
<ClInclude Include="..\..\src\ripple\common\byte_view.h" />

2
Builds/VisualStudio2013/RippleD.vcxproj.filters
View File

@@ -3041,7 +3041,6 @@
<ClInclude Include="..\..\src\ripple_app\transactors\WalletAddTransactor.h">
<Filter>[2] Old Ripple\ripple_app\transactors</Filter>
</ClInclude>
<ClInclude Include="..\..\src\BeastConfig\BeastConfig.h" />
<ClInclude Include="..\..\src\ripple\common\impl\MultiSocketType.h">
<Filter>[1] Ripple\common\impl</Filter>
</ClInclude>
@@ -3054,6 +3053,7 @@
<ClInclude Include="..\..\src\ripple\common\byte_view.h">
<Filter>[1] Ripple\common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\BeastConfig.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">

1
SConstruct
View File

@@ -207,7 +207,6 @@ env['PRINT_CMD_LINE_FUNC'] = print_cmd_line
#
INCLUDE_PATHS = [
'.',
'src/BeastConfig',
'src/leveldb',
'src/leveldb/port',
'src/leveldb/include',

0
src/BeastConfig/BeastConfig.h → src/BeastConfig.h
View File

0
src/beast/config/BeastConfig.h → src/beast/BeastConfig.h
View File

4
src/beast/Builds/VisualStudio2013/Beast.props
View File

@@ -8,10 +8,10 @@
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>BEAST_COMPILING_STATIC_LIBARARY=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>BEAST_INCLUDE_BEASTCONFIG=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>$(RepoDir)\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>

2
src/beast/Builds/VisualStudio2013/beast.vcxproj
View File

@@ -82,6 +82,7 @@
<None Include="..\..\scripts\compile.sh" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\BeastConfig.h" />
<ClInclude Include="..\..\beast\Arithmetic.h" />
<ClInclude Include="..\..\beast\Asio.h" />
<ClInclude Include="..\..\beast\asio\abstract_socket.h" />
@@ -247,7 +248,6 @@
<ClInclude Include="..\..\beast\utility\PropertyStream.h" />
<ClInclude Include="..\..\beast\utility\StaticObject.h" />
<ClInclude Include="..\..\beast\Version.h" />
<ClInclude Include="..\..\config\BeastConfig.h" />
<ClInclude Include="..\..\modules\beast_asio\async\AsyncObject.h" />
<ClInclude Include="..\..\modules\beast_asio\basics\FixedInputBuffer.h" />
<ClInclude Include="..\..\modules\beast_asio\basics\PeerRole.h" />

2
src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
View File

@@ -950,7 +950,6 @@
<ClInclude Include="..\..\beast\Chrono.h">
<Filter>beast</Filter>
</ClInclude>
<ClInclude Include="..\..\config\BeastConfig.h" />
<ClInclude Include="..\..\beast\utility\Error.h">
<Filter>beast\utility</Filter>
</ClInclude>
@@ -1323,6 +1322,7 @@
<ClInclude Include="..\..\beast\http\basic_message.h">
<Filter>beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\BeastConfig.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\modules\beast_core\containers\DynamicObject.cpp">

5
src/beast/TODO.txt
View File

@@ -41,9 +41,6 @@ BEAST TODO
- Think about doing away with BEAST_CALLTYPE and BEAST_API
- Decide if headers should just include BeastConfig.h instead of making the
host program do it.
- Rename malloc/calloc JUCE members that conflict with the debug CRT from MSVC
- Reformat every Doxygen comment
@@ -63,7 +60,7 @@ BEAST TODO
- restructure the repo sources to look like this:
/Source/beast/beast_core/beast_core.h
etc...
- Put the BeastConfig.h at the root of the repo.
- Make sure the template BeastConfig.h is included in the Doxyfile
- Implement robust key/value database with bulk write

4
src/beast/beast/asio/Asio.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "impl/IPAddressConversion.cpp"

4
src/beast/beast/asio/tests/bind_handler_tests.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../../BeastConfig.h"
#endif
#include "../../../modules/beast_core/beast_core.h" // for UnitTest

4
src/beast/beast/asio/tests/enable_wait_for_async.test.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../../BeastConfig.h"
#endif
#include "../../../modules/beast_core/beast_core.h" // for UnitTest

4
src/beast/beast/asio/tests/shared_handler_tests.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../../BeastConfig.h"
#endif
#include "../../../modules/beast_core/beast_core.h" // for UnitTest

4
src/beast/beast/asio/tests/wrap_handler_tests.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../../BeastConfig.h"
#endif
#include "../../../modules/beast_core/beast_core.h" // for UnitTest

4
src/beast/beast/boost/Boost.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "ErrorCode.h"

4
src/beast/beast/chrono/Chrono.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "../Config.h"
#include "../../modules/beast_core/beast_core.h" // for UnitTest

19
src/beast/beast/config/ConfigCheck.h
View File

@@ -20,25 +20,6 @@
#ifndef BEAST_CONFIG_CONFIGCHECK_H_INCLUDED
#define BEAST_CONFIG_CONFIGCHECK_H_INCLUDED
// This file makes sure that BeastConfig.h was included.
// It also sets defaults for all config options.
/* If you fail to make sure that all your compile units are building Beast with
the same set of option flags, then there's a risk that different compile
units will treat the classes as having different memory layouts, leading to
very nasty memory corruption errors when they all get linked together.
That's why it's best to always include the BeastConfig.h file before any
beast headers.
*/
#ifndef BEAST_BEASTCONFIG_H_INCLUDED
# ifdef _MSC_VER
# pragma message ("Have you included your BeastConfig.h file before including the Beast headers?")
# else
# warning "Have you included your BeastConfig.h file before including the Beast headers?"
# endif
# error "BeastConfig.h must be included before any Beast headers!"
#endif
//
// Apply sensible defaults for the configuration settings
//

4
src/beast/beast/container/Container.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "impl/aged_associative_container.cpp"

4
src/beast/beast/crypto/Crypto.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "../../modules/beast_core/beast_core.h" // for UnitTest

4
src/beast/beast/cxx14/tests/integer_sequence.test.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../../BeastConfig.h"
#endif
#include "../utility.h"

4
src/beast/beast/http/HTTP.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "impl/URL.cpp"
#include "impl/ParsedURL.cpp"

4
src/beast/beast/http/impl/joyent_parser.cpp
View File

@@ -17,10 +17,6 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../Config.h"
namespace beast {
namespace joyent {

2
src/beast/beast/http/impl/joyent_parser.h
View File

@@ -20,8 +20,6 @@
#ifndef BEAST_HTTP_JOYENT_PARSER_H_INCLUDED
#define BEAST_HTTP_JOYENT_PARSER_H_INCLUDED
#include "BeastConfig.h"
#include "../basic_message.h"
// TODO Use <system_error>

4
src/beast/beast/insight/Insight.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "../Config.h"

4
src/beast/beast/net/Net.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "../Config.h"

4
src/beast/beast/smart_ptr/SmartPtr.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "../Config.h"

4
src/beast/beast/strings/Strings.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "impl/CharacterFunctions.cpp"
#include "impl/String.cpp"

4
src/beast/beast/threads/Threads.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "impl/Atomic.cpp"
#include "impl/RecursiveMutex.cpp"

4
src/beast/beast/utility/Utility.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "impl/Error.cpp"

2
src/beast/demos/unittests/.gitignore vendored
View File

@@ -1,2 +0,0 @@
builds/vs2012/Debug
builds/vs2012/Release

19
src/beast/demos/unittests/builds/vs2012/unittests.filters
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="beast-win32.cpp" />
<ClCompile Include="..\shared\BeastUnitTests.cpp">
<Filter>shared</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="shared">
<UniqueIdentifier>{986861c7-f1e7-4a41-bea0-eede68819634}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\shared\BeastUnitTests.h">
<Filter>shared</Filter>
</ClInclude>
</ItemGroup>
</Project>

93
src/beast/demos/unittests/builds/vs2012/unittests.vcxproj
View File

@@ -1,93 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{36E40B92-F578-4599-9909-70952176D18A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\config;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\config;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\beast</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\beast.cpp" />
<ClCompile Include="..\..\src\BeastUnitTests.cpp" />
<ClCompile Include="..\..\src\win32.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\beast.h" />
<ClInclude Include="..\..\src\BeastUnitTests.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

279
src/beast/demos/unittests/builds/xcode/unittests.xcodeproj/project.pbxproj
View File

@@ -1,279 +0,0 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
CD0A5B3F181707F700DA0342 /* mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0A5B3E181707F700DA0342 /* mac.cpp */; };
CD0A5B421817097800DA0342 /* BeastUnitTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0A5B401817097800DA0342 /* BeastUnitTests.cpp */; };
CD0A5B4918170DC300DA0342 /* beast_modules.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD0A5B4818170DC300DA0342 /* beast_modules.mm */; };
CD0A5B4B18170EBC00DA0342 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD0A5B4A18170EBC00DA0342 /* CoreServices.framework */; };
CD0A5B4E18170F0D00DA0342 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD0A5B4D18170F0D00DA0342 /* AppKit.framework */; };
CD1CBE68181B2D99002CCC0C /* juce_modules.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD1CBE64181B2689002CCC0C /* juce_modules.mm */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
CD0A5B301817074500DA0342 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
CD0A5B321817074500DA0342 /* unittests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = unittests; sourceTree = BUILT_PRODUCTS_DIR; };
CD0A5B3E181707F700DA0342 /* mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mac.cpp; path = ../../src/mac.cpp; sourceTree = "<group>"; };
CD0A5B401817097800DA0342 /* BeastUnitTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BeastUnitTests.cpp; path = ../../src/BeastUnitTests.cpp; sourceTree = "<group>"; };
CD0A5B411817097800DA0342 /* BeastUnitTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BeastUnitTests.h; path = ../../src/BeastUnitTests.h; sourceTree = "<group>"; };
CD0A5B4318170A5100DA0342 /* beast_modules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = beast_modules.cpp; path = ../../src/beast_modules.cpp; sourceTree = "<group>"; };
CD0A5B4418170A5100DA0342 /* beast_modules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = beast_modules.h; path = ../../src/beast_modules.h; sourceTree = "<group>"; };
CD0A5B4818170DC300DA0342 /* beast_modules.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = beast_modules.mm; path = ../../src/beast_modules.mm; sourceTree = "<group>"; };
CD0A5B4A18170EBC00DA0342 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
CD0A5B4D18170F0D00DA0342 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
CD0A5B4F181714A000DA0342 /* beast */ = {isa = PBXFileReference; lastKnownFileType = folder; name = beast; path = ../../../../beast; sourceTree = "<group>"; };
CD0A5B50181714B800DA0342 /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; name = modules; path = ../../../../modules; sourceTree = "<group>"; };
CD1CBE62181B2689002CCC0C /* juce_modules.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_modules.cpp; path = ../../src/juce_modules.cpp; sourceTree = "<group>"; };
CD1CBE63181B2689002CCC0C /* juce_modules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_modules.h; path = ../../src/juce_modules.h; sourceTree = "<group>"; };
CD1CBE64181B2689002CCC0C /* juce_modules.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_modules.mm; path = ../../src/juce_modules.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
CD0A5B2F1817074500DA0342 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CD0A5B4E18170F0D00DA0342 /* AppKit.framework in Frameworks */,
CD0A5B4B18170EBC00DA0342 /* CoreServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
CD0A5B291817074500DA0342 = {
isa = PBXGroup;
children = (
CD0A5B50181714B800DA0342 /* modules */,
CD0A5B4F181714A000DA0342 /* beast */,
CD0A5B4318170A5100DA0342 /* beast_modules.cpp */,
CD0A5B4418170A5100DA0342 /* beast_modules.h */,
CD0A5B4818170DC300DA0342 /* beast_modules.mm */,
CD0A5B401817097800DA0342 /* BeastUnitTests.cpp */,
CD0A5B411817097800DA0342 /* BeastUnitTests.h */,
CD1CBE62181B2689002CCC0C /* juce_modules.cpp */,
CD1CBE63181B2689002CCC0C /* juce_modules.h */,
CD1CBE64181B2689002CCC0C /* juce_modules.mm */,
CD0A5B3E181707F700DA0342 /* mac.cpp */,
CD0A5B4C18170EC600DA0342 /* Frameworks */,
CD0A5B331817074500DA0342 /* Products */,
);
sourceTree = "<group>";
};
CD0A5B331817074500DA0342 /* Products */ = {
isa = PBXGroup;
children = (
CD0A5B321817074500DA0342 /* unittests */,
);
name = Products;
sourceTree = "<group>";
};
CD0A5B4C18170EC600DA0342 /* Frameworks */ = {
isa = PBXGroup;
children = (
CD0A5B4D18170F0D00DA0342 /* AppKit.framework */,
CD0A5B4A18170EBC00DA0342 /* CoreServices.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
CD0A5B311817074500DA0342 /* unittests */ = {
isa = PBXNativeTarget;
buildConfigurationList = CD0A5B3B1817074500DA0342 /* Build configuration list for PBXNativeTarget "unittests" */;
buildPhases = (
CD0A5B2E1817074500DA0342 /* Sources */,
CD0A5B2F1817074500DA0342 /* Frameworks */,
CD0A5B301817074500DA0342 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = unittests;
productName = unittests;
productReference = CD0A5B321817074500DA0342 /* unittests */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
CD0A5B2A1817074500DA0342 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Patrick Dehne";
};
buildConfigurationList = CD0A5B2D1817074500DA0342 /* Build configuration list for PBXProject "unittests" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = CD0A5B291817074500DA0342;
productRefGroup = CD0A5B331817074500DA0342 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
CD0A5B311817074500DA0342 /* unittests */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
CD0A5B2E1817074500DA0342 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CD0A5B3F181707F700DA0342 /* mac.cpp in Sources */,
CD0A5B421817097800DA0342 /* BeastUnitTests.cpp in Sources */,
CD1CBE68181B2D99002CCC0C /* juce_modules.mm in Sources */,
CD0A5B4918170DC300DA0342 /* beast_modules.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
CD0A5B391817074500DA0342 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../src",
"$(SRCROOT)/../../../../../../../JUCE",
"$(SRCROOT)/../../../../config",
"$(SRCROOT)/../../../..",
);
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Debug;
};
CD0A5B3A1817074500DA0342 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../src",
"$(SRCROOT)/../../../../../../../JUCE",
"$(SRCROOT)/../../../../config",
"$(SRCROOT)/../../../..",
);
MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;
};
CD0A5B3C1817074500DA0342 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
CD0A5B3D1817074500DA0342 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
CD0A5B2D1817074500DA0342 /* Build configuration list for PBXProject "unittests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CD0A5B391817074500DA0342 /* Debug */,
CD0A5B3A1817074500DA0342 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
CD0A5B3B1817074500DA0342 /* Build configuration list for PBXNativeTarget "unittests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CD0A5B3C1817074500DA0342 /* Debug */,
CD0A5B3D1817074500DA0342 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = CD0A5B2A1817074500DA0342 /* Project object */;
}

94
src/beast/demos/unittests/src/AppConfig.h
View File

@@ -1,94 +0,0 @@
/*
IMPORTANT! This file is auto-generated each time you save your
project - if you alter its contents, your changes may be overwritten!
There's a section below where you can add your own custom code safely, and the
Introjucer will preserve the contents of that block, but the best way to change
any of these definitions is by using the Introjucer's project settings.
Any commented-out settings will assume their default values.
*/
#ifndef __JUCE_APPCONFIG_M70QFTRRK__
#define __JUCE_APPCONFIG_M70QFTRRK__
//==============================================================================
// [BEGIN_USER_CODE_SECTION]
// (You can add your own code in this section, and the Introjucer will not overwrite it)
// [END_USER_CODE_SECTION]
//==============================================================================
#define JUCE_MODULE_AVAILABLE_juce_core 1
//#define JUCE_MODULE_AVAILABLE_juce_cryptography 1
//#define JUCE_MODULE_AVAILABLE_juce_data_structures 1
#define JUCE_MODULE_AVAILABLE_juce_events 1
//#define JUCE_MODULE_AVAILABLE_juce_graphics 1
//#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1
//#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1
//==============================================================================
// juce_core flags:
#ifndef JUCE_FORCE_DEBUG
//#define JUCE_FORCE_DEBUG
#endif
#ifndef JUCE_LOG_ASSERTIONS
#define JUCE_LOG_ASSERTIONS 1
#endif
#ifndef JUCE_CHECK_MEMORY_LEAKS
//#define JUCE_CHECK_MEMORY_LEAKS
#endif
#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
//#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
#endif
#ifndef JUCE_INCLUDE_ZLIB_CODE
//#define JUCE_INCLUDE_ZLIB_CODE
#endif
//==============================================================================
// juce_graphics flags:
#ifndef JUCE_USE_COREIMAGE_LOADER
#define JUCE_USE_COREIMAGE_LOADER 0
#endif
#ifndef JUCE_USE_DIRECTWRITE
//#define JUCE_USE_DIRECTWRITE
#endif
//==============================================================================
// juce_gui_basics flags:
#ifndef JUCE_ENABLE_REPAINT_DEBUGGING
//#define JUCE_ENABLE_REPAINT_DEBUGGING
#endif
#ifndef JUCE_USE_XSHM
//#define JUCE_USE_XSHM
#endif
#ifndef JUCE_USE_XRENDER
//#define JUCE_USE_XRENDER
#endif
#ifndef JUCE_USE_XCURSOR
//#define JUCE_USE_XCURSOR
#endif
//==============================================================================
// juce_gui_extra flags:
#ifndef JUCE_WEB_BROWSER
//#define JUCE_WEB_BROWSER
#endif
#endif // __JUCE_APPCONFIG_M70QFTRRK__

79
src/beast/demos/unittests/src/BeastUnitTests.cpp
View File

@@ -1,79 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 "BeastUnitTests.h"
class BeastUnitTests : public beast::UnitTests
{
public:
explicit BeastUnitTests (bool shouldLog)
: m_shouldLog (shouldLog)
{
}
void logMessage (beast::String const& message)
{
if (m_shouldLog)
std::cout << message.toStdString () << std::endl;
}
private:
bool const m_shouldLog;
};
int runUnitTests (beast::String const& match, beast::String const& format)
{
bool const shouldLog = format != "junit";
if (format != "junit" && format != "text" && format != "")
{
beast::String s;
s << "Warning, unknown unittest-format='" << format << "'";
// Log::out () << s.toStdString ();
}
BeastUnitTests tr (shouldLog);
tr.runSelectedTests (match);
if (format == "junit")
{
beast::UnitTestUtilities::JUnitXMLFormatter f (tr);
beast::String const s = f.createDocumentString ();
std::cout << s.toStdString ();
}
else
{
beast::UnitTests::Results const& r (tr.getResults ());
beast::String s;
s << "Summary: " <<
beast::String (r.suites.size ()) << " suites, " <<
beast::String (r.cases) << " cases, " <<
beast::String (r.tests) << " tests, " <<
beast::String (r.failures) << " failure" << ((r.failures != 1) ? "s" : "") << ".";
tr.logMessage (s);
}
return tr.anyTestsFailed () ? EXIT_FAILURE : EXIT_SUCCESS;
}

27
src/beast/demos/unittests/src/BeastUnitTests.h
View File

@@ -1,27 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 UNITTESTS_BEASTUNITTESTS_H_INCLUDED
#define UNITTESTS_BEASTUNITTESTS_H_INCLUDED
#include "beast_modules.h"
int runUnitTests (beast::String const& match, beast::String const& format);
#endif

31
src/beast/demos/unittests/src/beast_modules.cpp
View File

@@ -1,31 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 "beast_modules.h"
#include "modules/beast_core/beast_core.cpp"
#include "modules/beast_vflib/beast_vflib.cpp"
#include "beast/chrono/Chrono.cpp"
#include "beast/crypto/Crypto.cpp"
#include "beast/strings/Strings.cpp"
#include "beast/threads/Threads.cpp"
//#include "beast/http/HTTP.cpp"
#include "beast/net/Net.cpp"
#include "beast/utility/Utility.cpp"

33
src/beast/demos/unittests/src/beast_modules.h
View File

@@ -1,33 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 UNITTESTS_BEASTMODULES_H_INCLUDED
#define UNITTESTS_BEASTMODULES_H_INCLUDED
#include "BeastConfig.h"
#include "modules/beast_core/beast_core.h"
#include "modules/beast_vflib/beast_vflib.h"
#include "beast/Strings.h"
#include "beast/Threads.h"
#include "beast/SmartPtr.h"
#include "beast/Chrono.h"
#endif

20
src/beast/demos/unittests/src/beast_modules.mm
View File

@@ -1,20 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 "beast_modules.cpp"

21
src/beast/demos/unittests/src/juce_modules.cpp
View File

@@ -1,21 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 "modules/juce_core/juce_core.cpp"
#include "modules/juce_events/juce_events.cpp"

28
src/beast/demos/unittests/src/juce_modules.h
View File

@@ -1,28 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 UNITTESTS_JUCEMODULES_H_INCLUDED
#define UNITTESTS_JUCEMODULES_H_INCLUDED
#include "AppConfig.h"
#include "modules/juce_core/juce_core.h"
#include "modules/juce_events/juce_events.h"
#endif

20
src/beast/demos/unittests/src/juce_modules.mm
View File

@@ -1,20 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 "juce_modules.cpp"

29
src/beast/demos/unittests/src/mac.cpp
View File

@@ -1,29 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 "juce_modules.h"
#include "beast_modules.h"
#include "BeastUnitTests.h"
int main(int argc, const char * argv[])
{
juce::ScopedJuceInitialiser_GUI juce;
return runUnitTests("", "text");
}

30
src/beast/demos/unittests/src/win32.cpp
View File

@@ -1,30 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright Patrick Dehne <patrick@mysonicweb.de> (www.sonicweb-radio.de)
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 <stdio.h>
#include <tchar.h>
#include "BeastUnitTests.h"
int _tmain(int argc, _TCHAR* argv[])
{
runUnitTests("", "text");
return 0;
}

4
src/beast/modules/beast_asio/beast_asio.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "system/OpenSSLIncludes.h"

17
src/beast/modules/beast_asio/beast_asio.h
View File

@@ -20,23 +20,6 @@
#ifndef BEAST_ASIO_MODULE_H_INCLUDED
#define BEAST_ASIO_MODULE_H_INCLUDED
//------------------------------------------------------------------------------
/* If you fail to make sure that all your compile units are building Beast with
the same set of option flags, then there's a risk that different compile
units will treat the classes as having different memory layouts, leading to
very nasty memory corruption errors when they all get linked together.
That's why it's best to always include the BeastConfig.h file before any
beast headers.
*/
#ifndef BEAST_BEASTCONFIG_H_INCLUDED
# ifdef _MSC_VER
# pragma message ("Have you included your BeastConfig.h file before including the Beast headers?")
# else
# warning "Have you included your BeastConfig.h file before including the Beast headers?"
# endif
#endif
// Must come before boost includes to fix the bost placeholders.
#include "../beast_core/beast_core.h"

24
src/beast/modules/beast_core/beast_core.cpp
View File

@@ -21,9 +21,9 @@
*/
//==============================================================================
// Your project must contain a BeastConfig.h file with your project-specific settings in it,
// and your header search path must make it accessible to the module's files.
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
//==============================================================================
#include "native/BasicNativeHeaders.h"
@@ -280,23 +280,5 @@ void beast_reportFatalError (char const* message, char const* fileName, int line
#pragma pop_macro("_aligned_msize")
#endif
//------------------------------------------------------------------------------
// When we compile the static library, which is really just for browsing the
// sources in the Visual Studio IDE, we want to compile each individual unity
// .cpp in order to make sure that it builds by itself. An application that
// uses beast will typically include all of these .cpp files in one of its
// own unity .cpp
#if ! BEAST_COMPILING_STATIC_LIBARARY
/*
#include "../../beast/chrono/Chrono.cpp"
#include "../../beast/crypto/Crypto.cpp"
#include "../../beast/http/HTTP.cpp"
#include "../../beast/net/Net.cpp"
#include "../../beast/strings/Strings.cpp"
#include "../../beast/utility/Utility.cpp"
*/
#endif
// Must be outside the namespace
#include "system/BoostPlaceholdersFix.cpp"

4
src/beast/modules/beast_sqdb/beast_sqdb.cpp
View File

@@ -17,7 +17,9 @@
*/
//==============================================================================
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
#include "beast_sqdb.h"

4
src/beast/modules/beast_sqlite/beast_sqlite.c
View File

@@ -23,7 +23,9 @@
@ingroup beast_sqlite
*/
#include "BeastConfig.h"
#if BEAST_INCLUDE_BEASTCONFIG
#include "../../BeastConfig.h"
#endif
// Prevents sqlite.h from being included, since it screws up the .c
#define BEAST_SQLITE_CPP_INCLUDED

3
src/beast/modules/beast_sqlite/beast_sqlite.h
View File

@@ -25,9 +25,6 @@
This external module provides the SQLite embedded database library.
SQLite is public domain software, visit http://sqlite.org
@note To control the use of the native SQLite library on supported platforms,
see BeastConfig.h.
*/
#include "../../beast/config/PlatformConfig.h"

94
src/beast/notes/1/test.cpp
View File

@@ -1,94 +0,0 @@
/*
This code normally fails to compile under Visual Studio 2012
The fix is marked with _MSC_VER
*/
#include <iostream>
#include <typeinfo>
template <class T> struct has_lowest_layer_type {
typedef char yes;
typedef struct {char dummy[2];} no;
template <class C> static yes f(typename C::lowest_layer_type*);
template <class C> static no f(...);
#ifdef _MSC_VER
static const bool value = sizeof(f<T>(0)) == 1;
#else
static const bool value = sizeof(has_lowest_layer_type<T>::f<T>(0)) == 1;
#endif
};
template <bool Enable>
struct EnableIf : std::false_type { };
template <>
struct EnableIf <true> : std::true_type { };
struct tcp { };
template <class Protocol>
struct basic_socket
{
typedef basic_socket <Protocol> lowest_layer_type;
};
template <class Protocol>
struct basic_stream_socket : basic_socket <Protocol>
{
typedef basic_socket <Protocol> next_layer_type;
};
struct A
{
typedef basic_socket <tcp> lowest_layer_type;
};
struct B
{
};
template <typename T>
void show (std::true_type)
{
std::cout << typeid(T).name() << " has lowest_layer_type" << std::endl;
}
template <typename T>
void show (std::false_type)
{
std::cout << typeid(T).name() << " does not have lowest_layer_type" << std::endl;
}
template <typename T>
void show ()
{
show <T> (EnableIf <has_lowest_layer_type <T>::value> ());
}
int main ()
{
show <A> ();
show <B> ();
show <basic_socket <tcp> > ();
show <basic_stream_socket <tcp> > ();
return 0;
}
/*
1>..\..\Subtrees\beast\notes\1\test.cpp(16): error C2783: 'has_lowest_layer_type<T>::no has_lowest_layer_type<T>::f(...)' : could not deduce template argument for 'C'
1> with
1> [
1> T=A
1> ]
1> ..\..\Subtrees\beast\notes\1\test.cpp(15) : see declaration of 'has_lowest_layer_type<T>::f'
1> with
1> [
1> T=A
1> ]
1> ..\..\Subtrees\beast\notes\1\test.cpp(63) : see reference to class template instantiation 'has_lowest_layer_type<T>' being compiled
1> with
1> [
1> T=A
1> ]
1> ..\..\Subtrees\beast\notes\1\test.cpp(68) : see reference to function template instantiation 'void show<A>(void)' being compiled
*/

2
src/ripple/beast/ripple_beast.cpp
View File

@@ -23,7 +23,7 @@
*/
// MUST come first!
#include "BeastConfig.h"
#include "../../BeastConfig.h"
// Include this to get all the basic includes included, to prevent errors
#include "../beast/modules/beast_core/beast_core.h"

2
src/ripple/beast/ripple_beastc.c
View File

@@ -24,7 +24,7 @@
Note that these sources must be compiled using the C compiler.
*/
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#ifdef __cplusplus
#error "Whoops! This file must be compiled with a C compiler!"

2
src/ripple/common/ripple_common.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "../../beast/modules/beast_core/beast_core.h" // for UnitTest

2
src/ripple/http/ripple_http.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_http.h"

2
src/ripple/json/ripple_json.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include <cassert>
#include <cstdlib>

2
src/ripple/peerfinder/ripple_peerfinder.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_peerfinder.h"

2
src/ripple/radmap/ripple_radmap.cpp
View File

@@ -17,6 +17,6 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "impl/BasicFullBelowCache.cpp"

2
src/ripple/resource/ripple_resource.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_resource.h"

2
src/ripple/rocksdb/ripple_rocksdb.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_rocksdb.h"

2
src/ripple/sitefiles/ripple_sitefiles.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_sitefiles.h"

2
src/ripple/sslutil/ripple_sslutil.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_sslutil.h"

2
src/ripple/testoverlay/ripple_testoverlay.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_testoverlay.h"

2
src/ripple/types/ripple_types.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_types.h"
#include "../ripple/sslutil/ripple_sslutil.h"

2
src/ripple/validators/ripple_validators.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_validators.h"

2
src/ripple_app/ripple_app.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "../beast/modules/beast_core/system/BeforeBoost.h"
#include <boost/bimap.hpp>

2
src/ripple_app/ripple_app_pt1.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "../beast/modules/beast_core/system/BeforeBoost.h"
#include <boost/bimap.hpp>

2
src/ripple_app/ripple_app_pt2.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_app/ripple_app_pt3.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_app/ripple_app_pt4.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_app/ripple_app_pt5.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"
#include "../ripple_net/ripple_net.h"

2
src/ripple_app/ripple_app_pt6.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_app/ripple_app_pt7.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_app/ripple_app_pt8.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_app/ripple_app_pt9.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_app.h"

2
src/ripple_basics/ripple_basics.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_basics.h"

2
src/ripple_core/ripple_core.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_core.h"

2
src/ripple_data/ripple_data.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_data.h"

4
src/ripple_hyperleveldb/ripple_hyperleveldb.cpp
View File

@@ -17,9 +17,9 @@
*/
//==============================================================================
// Unity build file for LevelDB
// Unity build file for HyperLevelDB
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_hyperleveldb.h"

2
src/ripple_leveldb/ripple_leveldb.cpp
View File

@@ -19,7 +19,7 @@
// Unity build file for LevelDB
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_leveldb.h"

2
src/ripple_net/ripple_net.cpp
View File

@@ -23,7 +23,7 @@
@ingroup ripple_net
*/
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "../beast/modules/beast_core/system/BeforeBoost.h"
#include <boost/version.hpp>

2
src/ripple_overlay/ripple_overlay.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_overlay.h"

2
src/ripple_rpc/ripple_rpc.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#include "ripple_rpc.h"

2
src/ripple_websocket/ripple_websocket.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
#include "BeastConfig.h"
#include "../../BeastConfig.h"
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1