From: srajko_at_[hidden]
Date: 2007-05-20 18:58:24
Author: srajko
Date: 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
New Revision: 4150
URL: http://svn.boost.org/trac/boost/changeset/4150
Log:
make rpc examples and docs build with boost cvs head
Added:
sandbox/rpc/libs/rpc/vc8ide/example.vcproj
- copied, changed from r4122, /sandbox/rpc/libs/rpc/vc8ide/rpc_example.vcproj
sandbox/rpc/libs/rpc/vc8ide/test.vcproj
- copied, changed from r4122, /sandbox/rpc/libs/rpc/vc8ide/test_rpc.vcproj
Removed:
sandbox/rpc/libs/rpc/vc8ide/rpc_example.vcproj
sandbox/rpc/libs/rpc/vc8ide/test_rpc.vcproj
Text files modified:
sandbox/rpc/boost-build.jam | 12 +++---------
sandbox/rpc/libs/rpc/doc/Jamfile.v2 | 6 ++++--
sandbox/rpc/libs/rpc/doc/dox/rpc.hpp | 6 ------
sandbox/rpc/libs/rpc/doc/rpc.qbk | 15 ++++++++++-----
sandbox/rpc/libs/rpc/vc8ide/doc.vcproj | 10 +++++++---
sandbox/rpc/libs/rpc/vc8ide/example.vcproj | 6 +++---
sandbox/rpc/libs/rpc/vc8ide/test.vcproj | 2 +-
sandbox/rpc/project-root.jam | 3 ++-
8 files changed, 30 insertions(+), 30 deletions(-)
Modified: sandbox/rpc/boost-build.jam
==============================================================================
--- sandbox/rpc/boost-build.jam (original)
+++ sandbox/rpc/boost-build.jam 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -5,12 +5,6 @@
# Set the BOOST_ROOT environment variable on your command-line or in the
# environment to point at the root of your regular Boost installation.
-if --v2 in $(ARGV)
-{
- JAMFILE = [Jj]amfile.v2 ;
- boost-build $(BOOST_ROOT)/tools/build/v2 ;
-}
-else
-{
- boost-build $(BOOST_ROOT)/tools/build/v1 ;
-}
\ No newline at end of file
+
+JAMFILE = [Jj]amfile.v2 ;
+boost-build $(BOOST_ROOT)/tools/build/v2 ;
Modified: sandbox/rpc/libs/rpc/doc/Jamfile.v2
==============================================================================
--- sandbox/rpc/libs/rpc/doc/Jamfile.v2 (original)
+++ sandbox/rpc/libs/rpc/doc/Jamfile.v2 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -7,6 +7,8 @@
import boostbook : boostbook ;
using quickbook ;
+local loc = [ path.native [ path.pwd ] ] ;
+
doxygen rpc_doxygen
:
[ glob ../../../boost/rpc/*.hpp dox/*.hpp ]
@@ -17,8 +19,8 @@
<doxygen:param>EXTRACT_PRIVATE=NO
<doxygen:param>DETAILS_AT_TOP=YES
<doxygen:param>GENERATE_HTML=YES
- <doxygen:param>HTML_OUTPUT=html/rpc/doxygen
- <doxygen:param>HTML_STYLESHEET=html/boostbook_doxygen.css
+ <doxygen:param>HTML_OUTPUT=$(loc)/html/doxygen
+ <doxygen:param>HTML_STYLESHEET=$(loc)/html/boostbook_doxygen.css
<doxygen:param>ENABLE_PREPROCESSING=YES
<doxygen:param>MACRO_EXPANSION=YES
<doxygen:param>SEARCH_INCLUDES=YES
Modified: sandbox/rpc/libs/rpc/doc/dox/rpc.hpp
==============================================================================
--- sandbox/rpc/libs/rpc/doc/dox/rpc.hpp (original)
+++ sandbox/rpc/libs/rpc/doc/dox/rpc.hpp 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -11,7 +11,6 @@
- \ref sec_client_side
- \ref sec_client
- \ref sec_call
-- \ref sec_example
\section sec_server_side Server-side Components
@@ -73,11 +72,6 @@
\skip // make some function calls
\until }
-\section sec_example Example Code
-
-\dontinclude rpc_example.cpp
-\skip <boost
-\until end void network_marshal_test
*/
}
\ No newline at end of file
Modified: sandbox/rpc/libs/rpc/doc/rpc.qbk
==============================================================================
--- sandbox/rpc/libs/rpc/doc/rpc.qbk (original)
+++ sandbox/rpc/libs/rpc/doc/rpc.qbk 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -52,14 +52,19 @@
[section:using Using the Library]
-Please see the [@rpc/doxygen/index.html Tutorial and Reference] for some examples of using the library.
+Please see the [@doxygen/index.html Tutorial and Reference].
+
+Also, the following code illustrates some use of the library:
+
+[import ../example/rpc_example.cpp]
+[rpc_example]
[endsect]
[endsect]
[section:tutorial Tutorial and Reference]
-The tutorial and reference for this library is available on a [@doxygen/index.html separate page]
+The tutorial and reference for this library is available on a [@../doxygen/index.html separate page]
generated by Doxygen.
[endsect]
@@ -68,16 +73,16 @@
To use the RPC library, you will need:
-* a recent version of [@http://www.boost.org Boost] (I think 1_33_1 or 1_34 should both work)
-* [@http://sourceforge.net/project/showfiles.php?group_id=122478 Boost.Asio version 0.3.8 RC2]
+* a recent version of [@http://www.boost.org Boost] (1_33_1, 1_34, and CVS head should all work)
+* if you're not using Boost from CVS, you'll need [@http://sourceforge.net/project/showfiles.php?group_id=122478 Boost.Asio version 0.3.8 RC2]
* an [@http://braddock.com/~braddock/future/ implementation of futures] put together by Braddock Gaskill
-
Below are the different versions of the RPC library:
* version 0.1 5/19/2007 \[[@rpc_07_05_19.zip download]\]
* first implementation of the library using futures, making the RPC interface completely
asynchronous (with futures facilitating synchronous behavior).
* call options are deduced from the rpc call, and how the returned call handler is stored (or ignored).
+ * tested using OS X darwin GCC and MSVC 8.0
[endsect]
Modified: sandbox/rpc/libs/rpc/vc8ide/doc.vcproj
==============================================================================
--- sandbox/rpc/libs/rpc/vc8ide/doc.vcproj (original)
+++ sandbox/rpc/libs/rpc/vc8ide/doc.vcproj 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -17,13 +17,13 @@
<Configurations>
<Configuration
Name="release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
+ IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd ../doc
bjam"
+ BuildCommandLine="cd ../doc
bjam $(ConfigurationName)
"
ReBuildCommandLine=""
CleanCommandLine=""
Output=""
@@ -53,6 +53,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\doc\Jamfile.v2"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Copied: sandbox/rpc/libs/rpc/vc8ide/example.vcproj (from r4122, /sandbox/rpc/libs/rpc/vc8ide/rpc_example.vcproj)
==============================================================================
--- /sandbox/rpc/libs/rpc/vc8ide/rpc_example.vcproj (original)
+++ sandbox/rpc/libs/rpc/vc8ide/example.vcproj 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="rpc_example"
+ Name="example"
ProjectGUID="{27D2C191-D1C2-49B3-870B-010E2D8430A4}"
RootNamespace="rpc_example"
Keyword="MakeFileProj"
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="debug|Win32"
- OutputDirectory="..\..\..\bin.v2\libs\rpc\example\msvc\$(ConfigurationName)\threading-multi"
+ OutputDirectory="..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
@@ -37,7 +37,7 @@
</Configuration>
<Configuration
Name="release|Win32"
- OutputDirectory="..\..\..\bin.v2\libs\rpc\example\msvc\$(ConfigurationName)\threading-multi"
+ OutputDirectory="..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
Deleted: sandbox/rpc/libs/rpc/vc8ide/rpc_example.vcproj
==============================================================================
--- sandbox/rpc/libs/rpc/vc8ide/rpc_example.vcproj 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
+++ (empty file)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="rpc_example"
- ProjectGUID="{27D2C191-D1C2-49B3-870B-010E2D8430A4}"
- RootNamespace="rpc_example"
- Keyword="MakeFileProj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="debug|Win32"
- OutputDirectory="..\..\..\bin.v2\libs\rpc\example\msvc\$(ConfigurationName)\threading-multi"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="0"
- >
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="cd ../example
bjam --v2 $(ConfigurationName)"
- ReBuildCommandLine="cd ../example
bjam --v2 -a"
- CleanCommandLine="cd ../example
bjam --v2 --clean"
- Output="$(OutDir)\rpc_example.exe"
- PreprocessorDefinitions=""
- IncludeSearchPath="../example"
- ForcedIncludes=""
- AssemblySearchPath=""
- ForcedUsingAssemblies=""
- CompileAsManaged=""
- />
- </Configuration>
- <Configuration
- Name="release|Win32"
- OutputDirectory="..\..\..\bin.v2\libs\rpc\example\msvc\$(ConfigurationName)\threading-multi"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="0"
- >
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="cd ../example
bjam --v2 $(ConfigurationName)"
- ReBuildCommandLine=""
- CleanCommandLine=""
- Output="$(OutDir)\rpc_example.exe"
- PreprocessorDefinitions=""
- IncludeSearchPath=""
- ForcedIncludes=""
- AssemblySearchPath=""
- ForcedUsingAssemblies=""
- CompileAsManaged=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- >
- <File
- RelativePath="..\example\interface_example.cpp"
- >
- </File>
- <File
- RelativePath="..\example\rpc_example.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: sandbox/rpc/libs/rpc/vc8ide/test.vcproj (from r4122, /sandbox/rpc/libs/rpc/vc8ide/test_rpc.vcproj)
==============================================================================
--- /sandbox/rpc/libs/rpc/vc8ide/test_rpc.vcproj (original)
+++ sandbox/rpc/libs/rpc/vc8ide/test.vcproj 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="test_rpc"
+ Name="test"
ProjectGUID="{DC0901FF-C80A-4C97-8D50-7D1C66B5AB95}"
RootNamespace="test_rpc"
Keyword="MakeFileProj"
Deleted: sandbox/rpc/libs/rpc/vc8ide/test_rpc.vcproj
==============================================================================
--- sandbox/rpc/libs/rpc/vc8ide/test_rpc.vcproj 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
+++ (empty file)
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_rpc"
- ProjectGUID="{DC0901FF-C80A-4C97-8D50-7D1C66B5AB95}"
- RootNamespace="test_rpc"
- Keyword="MakeFileProj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="debug|Win32"
- OutputDirectory="..\..\..\bin.v2\libs\rpc\test\msvc\$(ConfigurationName)\threading-multi"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="0"
- >
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="cd ../test
bjam --v2 $(ConfigurationName)"
- ReBuildCommandLine="cd ../test
bjam --v2 -a"
- CleanCommandLine="cd ../test
bjam --v2 --clean"
- Output="$(OutDir)\test_rpc.exe"
- PreprocessorDefinitions=""
- IncludeSearchPath=""
- ForcedIncludes=""
- AssemblySearchPath=""
- ForcedUsingAssemblies=""
- CompileAsManaged=""
- />
- </Configuration>
- <Configuration
- Name="release|Win32"
- OutputDirectory="..\..\..\bin.v2\libs\rpc\test\msvc\$(ConfigurationName)\threading-multi"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="0"
- >
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="cd ../test
bjam --v2 $(ConfigurationName)"
- ReBuildCommandLine=""
- CleanCommandLine=""
- Output="$(OutDir)\test_rpc.exe"
- PreprocessorDefinitions=""
- IncludeSearchPath=""
- ForcedIncludes=""
- AssemblySearchPath=""
- ForcedUsingAssemblies=""
- CompileAsManaged=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\test\test_rpc.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: sandbox/rpc/project-root.jam
==============================================================================
--- sandbox/rpc/project-root.jam (original)
+++ sandbox/rpc/project-root.jam 2007-05-20 18:58:22 EDT (Sun, 20 May 2007)
@@ -4,4 +4,5 @@
# http://www.boost.org/LICENSE_1_0.txt)
import os ;
-path-constant BOOST_ROOT : [ os.environ BOOST_ROOT ] ;
\ No newline at end of file
+
+path-constant BOOST_ROOT : [ os.environ BOOST_ROOT ] ;