From: stipe_at_[hidden]
Date: 2007-11-16 00:17:20
Author: srajko
Date: 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
New Revision: 41137
URL: http://svn.boost.org/trac/boost/changeset/41137
Log:
update MSVC project files, make VTK example build with MSVC
Added:
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/dataflow.sln (contents, props changed)
Removed:
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/signal_network.sln
Text files modified:
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj | 350 ++++++++++++++++++++++++++++++++++++---
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj | 149 ++++++++++++++--
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj | 144 ++++++++++++---
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj | 244 ++++++++++++++++-----------
sandbox/SOC/2007/signals/libs/dataflow/example/VTK/Jamfile.v2 | 18 +
sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp | 4
6 files changed, 718 insertions(+), 191 deletions(-)
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="build"
- ProjectGUID="{C3FB6B91-7EE1-489E-BF66-7D28FA2FC982}"
+ ProjectGUID="{57094754-267b-4a64-9863-e12326346271}"
>
<Platforms>
<Platform
@@ -24,6 +24,7 @@
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
+
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -44,6 +45,7 @@
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
+
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -60,114 +62,402 @@
<Filter
Name="dataflow"
>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support.hpp"
+ >
+ </File>
+ <Filter
+ Name="connection"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\connection\operators.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\connection\group.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\connection\port_map.hpp"
+ >
+ </File>
+ <Filter
+ Name="operator"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\connection\operator\group.hpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="detail"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\detail\make_ref.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\detail\enable_if_defined.hpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="phoenix"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\static_function.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\support.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\advance.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\static_value.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\components.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\sequence_environment.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\producer_container.hpp"
+ >
+ </File>
+ <Filter
+ Name="connection"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\connection\iterator_relative.hpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="component"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\constant.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer_accumulator.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer_wrapper.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\consumer.hpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="detail"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\detail\static_function_call.hpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="support"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\filter.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\common.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\invocable.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\binary_operation.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\port.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\keyed_port.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\proxy_port.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\unary_operation.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\component_operation.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\reflective_component.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\component.hpp"
+ >
+ </File>
+ <Filter
+ Name="port"
+ >
+ <Filter
+ Name="detail"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\port\detail\proxy_port_traits_sequence.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\support\port\detail\port_traits_sequence.hpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="templates"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\templates\binary_operation.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\templates\operator.hpp"
+ >
+ </File>
+ </Filter>
<Filter
Name="signals"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\connection.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\support.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\support.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\runtime_support.hpp"
>
</File>
<Filter
+ Name="connection"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\operators.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\slot_selector.hpp"
+ >
+ </File>
+ <Filter
+ Name="detail"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\replace_return_type.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\result_of_defined.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\bind_object.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\slot_type.hpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
Name="component"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\applicator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\junction.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\chain.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\modifier.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\conditional.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\applicator.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\conditional_modifier.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\mutex.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\counter.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional_templated.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\filter.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\filter_base.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\timed_generator.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\function.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\socket_receiver.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\instantiator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\instantiator.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\junction.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\filter_base.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\modifier.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\counter.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\mutex.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional_modifier.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\selector.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\chain.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\socket_receiver.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\function.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\socket_sender.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\filter.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\storage.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\condition.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\component\timed_generator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\socket_sender.hpp"
>
</File>
- </Filter>
- <Filter
- Name="connection"
- >
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\connection\slot_selector.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\storage.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\connection\slot_selector_map.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\multiplexer.hpp"
>
</File>
+ <Filter
+ Name="detail"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\storable.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\serialize_fusion_vector.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\unfused_inherited.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\generic_template.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\unfused_inherited_templated.hpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="detail"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\detail\enable_if_defined.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\detail\enable_if_defined.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signal\detail\unfused_typed_class.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\detail\unfused_typed_class.hpp"
>
</File>
</Filter>
</Filter>
+ <Filter
+ Name="utility"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\utility\underlying_type.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\utility\copy_cv.hpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="blueprint"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\network.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\connection.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\component.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\connection_t.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\get_port.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\port.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\port_t.hpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="solution build"
@@ -177,11 +467,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\Jamfile.v2"
+ RelativePath="..\..\..\..\project-root.jam"
>
</File>
<File
- RelativePath="..\..\..\..\project-root.jam"
+ RelativePath="..\..\..\..\Jamfile.v2"
>
</File>
</Filter>
Added: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/dataflow.sln
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/dataflow.sln 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -0,0 +1,37 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "build.vcproj", "{57094754-267B-4A64-9863-E12326346271}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc", "doc.vcproj", "{BBAAD8A1-8792-4EAE-9899-20C359B62645}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{81616215-AE99-438D-ACFF-896032940990}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{151E2151-A02D-4748-ABA6-F75A68D72CCA}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ debug|Win32 = debug|Win32
+ release|Win32 = release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {57094754-267B-4A64-9863-E12326346271}.debug|Win32.ActiveCfg = debug|Win32
+ {57094754-267B-4A64-9863-E12326346271}.debug|Win32.Build.0 = debug|Win32
+ {57094754-267B-4A64-9863-E12326346271}.release|Win32.ActiveCfg = release|Win32
+ {57094754-267B-4A64-9863-E12326346271}.release|Win32.Build.0 = release|Win32
+ {BBAAD8A1-8792-4EAE-9899-20C359B62645}.debug|Win32.ActiveCfg = release|Win32
+ {BBAAD8A1-8792-4EAE-9899-20C359B62645}.debug|Win32.Build.0 = release|Win32
+ {BBAAD8A1-8792-4EAE-9899-20C359B62645}.release|Win32.ActiveCfg = release|Win32
+ {BBAAD8A1-8792-4EAE-9899-20C359B62645}.release|Win32.Build.0 = release|Win32
+ {81616215-AE99-438D-ACFF-896032940990}.debug|Win32.ActiveCfg = debug|Win32
+ {81616215-AE99-438D-ACFF-896032940990}.debug|Win32.Build.0 = debug|Win32
+ {81616215-AE99-438D-ACFF-896032940990}.release|Win32.ActiveCfg = release|Win32
+ {81616215-AE99-438D-ACFF-896032940990}.release|Win32.Build.0 = release|Win32
+ {151E2151-A02D-4748-ABA6-F75A68D72CCA}.debug|Win32.ActiveCfg = debug|Win32
+ {151E2151-A02D-4748-ABA6-F75A68D72CCA}.debug|Win32.Build.0 = debug|Win32
+ {151E2151-A02D-4748-ABA6-F75A68D72CCA}.release|Win32.ActiveCfg = release|Win32
+ {151E2151-A02D-4748-ABA6-F75A68D72CCA}.release|Win32.Build.0 = release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -3,48 +3,95 @@
ProjectType="Visual C++"
Version="8.00"
Name="doc"
- ProjectGUID="{63CC95EA-4647-495B-9072-D38F368D4C6E}"
- RootNamespace="doc"
- Keyword="MakeFileProj"
+ ProjectGUID="{bbaad8a1-8792-4eae-9899-20c359b62645}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="cd ../../doc
bjam --v2 $(ConfigurationName)"
ReBuildCommandLine="cd ../../doc
bjam --v2 -a $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
+
Output=""
- PreprocessorDefinitions="WIN32;NDEBUG"
+ PreprocessorDefinitions=""
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\doc\dataflow1.svg"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow2.svg"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow3.svg"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow1.png"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow2.png"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow3.png"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\phoenix.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow_table.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\Jamfile.v2"
+ >
+ </File>
<File
RelativePath="..\..\doc\components.qbk"
>
</File>
<File
- RelativePath="..\..\doc\connections.qbk"
+ RelativePath="..\..\doc\signals.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\future.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\concepts.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\rationale.qbk"
>
</File>
<File
@@ -52,14 +99,70 @@
>
</File>
<File
- RelativePath="..\..\doc\Jamfile.v2"
+ RelativePath="..\..\doc\port_concepts.qbk"
>
</File>
<File
- RelativePath="..\..\doc\signal_network.qbk"
+ RelativePath="..\..\doc\dataflow.qbk"
>
</File>
- </Files>
- <Globals>
- </Globals>
+ <Filter
+ Name="signals"
+ >
+ <File
+ RelativePath="..\..\doc\signals\components.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\signals\concepts.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\signals\introduction.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\signals\connections.qbk"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="phoenix"
+ >
+ <File
+ RelativePath="..\..\doc\phoenix\concepts.qbk"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="introduction"
+ >
+ <File
+ RelativePath="..\..\doc\introduction\gil_example.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\introduction\distributed_example.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\introduction\blueprint_example.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\introduction\vtk_example.qbk"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="blueprint"
+ >
+ <File
+ RelativePath="..\..\doc\blueprint\blueprint.qbk"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -3,79 +3,159 @@
ProjectType="Visual C++"
Version="8.00"
Name="example"
- ProjectGUID="{784DC2FD-A12D-48F9-9C2E-369833990427}"
- RootNamespace="example"
- Keyword="MakeFileProj"
+ ProjectGUID="{81616215-ae99-438d-acff-896032940990}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="debug|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
- Output="$(OutDir)\example.exe"
+
+ Output=""
PreprocessorDefinitions=""
- IncludeSearchPath="../../../"
+ IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- <Configuration
+ </Configuration>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
- Output="$(OutDir)\example.exe"
+
+ Output=""
PreprocessorDefinitions=""
- IncludeSearchPath="../../../../"
+ IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\example\edit_distance.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fibonacci.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\timing_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\Jamfile.v2"
+ >
+ </File>
+ <Filter
+ Name="VTK"
+ >
+ <File
+ RelativePath="..\..\example\VTK\Cone3.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\Cone4.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\Cone5.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\Cone6.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\Jamfile.v2"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\Cone.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\Cone2.cxx"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\VTK\vtk_dataflow_support.hpp"
+ >
+ </File>
+ </Filter>
<Filter
- Name="Source Files"
+ Name="signals"
>
<File
- RelativePath="..\..\example\example.cpp"
+ RelativePath="..\..\example\signals\simple_example_components.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\signals\simple_example.cpp"
>
</File>
<File
- RelativePath="..\..\example\timing_example.cpp"
+ RelativePath="..\..\example\signals\intro_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\signals\simple_distributed_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\signals\gil_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\signals\Jamfile.v2"
>
</File>
</Filter>
- <File
- RelativePath="..\..\example\Jamfile.v2"
+ <Filter
+ Name="blueprint"
>
- </File>
- </Files>
- <Globals>
- </Globals>
+ <File
+ RelativePath="..\..\example\blueprint\blueprint_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\blueprint\Jamfile.v2"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Deleted: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/signal_network.sln
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/signal_network.sln 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
+++ (empty file)
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "build.vcproj", "{C3FB6B91-7EE1-489E-BF66-7D28FA2FC982}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc", "doc.vcproj", "{63CC95EA-4647-495B-9072-D38F368D4C6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{784DC2FD-A12D-48F9-9C2E-369833990427}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{35BB1613-AEF0-4047-9F26-D42190A005EB}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- debug|Win32 = debug|Win32
- release|Win32 = release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C3FB6B91-7EE1-489E-BF66-7D28FA2FC982}.debug|Win32.ActiveCfg = debug|Win32
- {C3FB6B91-7EE1-489E-BF66-7D28FA2FC982}.debug|Win32.Build.0 = debug|Win32
- {C3FB6B91-7EE1-489E-BF66-7D28FA2FC982}.release|Win32.ActiveCfg = release|Win32
- {C3FB6B91-7EE1-489E-BF66-7D28FA2FC982}.release|Win32.Build.0 = release|Win32
- {63CC95EA-4647-495B-9072-D38F368D4C6E}.debug|Win32.ActiveCfg = release|Win32
- {63CC95EA-4647-495B-9072-D38F368D4C6E}.debug|Win32.Build.0 = release|Win32
- {63CC95EA-4647-495B-9072-D38F368D4C6E}.release|Win32.ActiveCfg = release|Win32
- {63CC95EA-4647-495B-9072-D38F368D4C6E}.release|Win32.Build.0 = release|Win32
- {784DC2FD-A12D-48F9-9C2E-369833990427}.debug|Win32.ActiveCfg = debug|Win32
- {784DC2FD-A12D-48F9-9C2E-369833990427}.debug|Win32.Build.0 = debug|Win32
- {784DC2FD-A12D-48F9-9C2E-369833990427}.release|Win32.ActiveCfg = release|Win32
- {784DC2FD-A12D-48F9-9C2E-369833990427}.release|Win32.Build.0 = release|Win32
- {35BB1613-AEF0-4047-9F26-D42190A005EB}.debug|Win32.ActiveCfg = debug|Win32
- {35BB1613-AEF0-4047-9F26-D42190A005EB}.debug|Win32.Build.0 = debug|Win32
- {35BB1613-AEF0-4047-9F26-D42190A005EB}.release|Win32.ActiveCfg = release|Win32
- {35BB1613-AEF0-4047-9F26-D42190A005EB}.release|Win32.Build.0 = release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -3,29 +3,28 @@
ProjectType="Visual C++"
Version="8.00"
Name="test"
- ProjectGUID="{35BB1613-AEF0-4047-9F26-D42190A005EB}"
- RootNamespace="test"
- Keyword="MakeFileProj"
+ ProjectGUID="{151e2151-a02d-4748-aba6-f75a68d72cca}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="debug|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
+
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -34,18 +33,19 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- <Configuration
+ </Configuration>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
+
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -54,88 +54,136 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\test\test_bind_object.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_branching.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_chain.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_connect.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_connections.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_counter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_disconnect.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_filter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_function.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_junction.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_multi_args.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_multi_out.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_multi_type.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_mutex.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_pull.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_result_of_defined.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_same_type.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_socket.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_storage.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\test\test_binary_op.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_keyed_port.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_proxy_port.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\my_producer_consumer.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_unary_op.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_component.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_port.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_reflective_component.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\Jamfile.v2"
+ >
+ </File>
+ <Filter
+ Name="signals"
+ >
+ <File
+ RelativePath="..\..\test\signals\test_mutex.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_storage.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_multi_args.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_multiplexer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_pull.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\Jamfile.v2"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_counter.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_result_of_defined.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_multi_out.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_connections.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_chain.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_function.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_filter.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_same_type.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_socket.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_junction.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_disconnect.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_connect.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_multi_type.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_branching.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\signals\test_bind_object.cpp"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/VTK/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/VTK/Jamfile.v2 (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/VTK/Jamfile.v2 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -28,13 +28,19 @@
<include>/usr/local/include/vtk-5.0/
<define>BOOST_ALL_NO_LIB=1
<toolset>darwin:<linkflags>"-framework CoreServices"
-
+ <toolset>darwin:<library>GL
+ <toolset>darwin:<library>X11
+ <toolset>darwin:<library>Xt
+ <library>vtkCommon
+ <library>vtkRendering
+ <library>vtkFiltering
+ <library>vtkGraphics
;
-exe Cone : Cone.cxx X11 Xt vtkCommon vtkRendering vtkFiltering vtkGraphics GL ;
-exe Cone2 : Cone2.cxx X11 Xt vtkCommon vtkRendering vtkFiltering vtkGraphics GL ;
-#exe Cone3 : Cone3.cxx X11 Xt vtkCommon vtkRendering vtkFiltering vtkGraphics GL ;
-#exe Cone4 : Cone4.cxx X11 Xt vtkCommon vtkRendering vtkFiltering vtkGraphics GL ;
-#exe Cone5 : Cone5.cxx X11 Xt vtkCommon vtkRendering vtkFiltering vtkGraphics GL ;
+exe Cone : Cone.cxx ;
+exe Cone2 : Cone2.cxx ;
+#exe Cone3 : Cone3.cxx ;
+#exe Cone4 : Cone4.cxx ;
+#exe Cone5 : Cone5.cxx ;
#exe Cone6 : Cone6.cxx X11 Xt vtkCommon vtkRendering vtkFiltering vtkGraphics vtkWidgets GL ;
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp 2007-11-16 00:17:17 EST (Fri, 16 Nov 2007)
@@ -30,8 +30,8 @@
network_type::component_type
source = network.add_component<signals::storage<void(int)> >(100),
sink = network.add_component<signals::storage<void(int)> >(0),
- source_float = network.add_component<signals::storage<void(float)> >(100.1),
- sink_float = network.add_component<signals::storage<void(float)> >(0);
+ source_float = network.add_component<signals::storage<void(float)> >(100.1f),
+ sink_float = network.add_component<signals::storage<void(float)> >(0.0f);
// Print some runtime info
std::cout << "source has " << network[source].num_ports() << " ports. " << std::endl;