Author: jensg
Date: Mon May 26 22:14:13 2014
New Revision: 1597655
URL: http://svn.apache.org/r1597655
Log:
THRIFT-2487: Tutorial requires two IDL files but only one is linked from the
Thrift web site
Patch: Jens Geyer
Modified:
thrift/cms-site/trunk/content/tutorial/index.html
thrift/cms-site/trunk/templates/tutorial_intro.md
Modified: thrift/cms-site/trunk/content/tutorial/index.html
URL:
http://svn.apache.org/viewvc/thrift/cms-site/trunk/content/tutorial/index.html?rev=1597655&r1=1597654&r2=1597655&view=diff
==============================================================================
--- thrift/cms-site/trunk/content/tutorial/index.html (original)
+++ thrift/cms-site/trunk/content/tutorial/index.html Mon May 26 22:14:13 2014
@@ -6,10 +6,10 @@
----
* ### Download Apache Thrift
- To get started, [download](/download) a copy of Thrift.
+To get started, [download](/download) a copy of Thrift.
* ### Build and Install the Apache Thrift compiler and libraries
- You will then need to build the Apache Thrift compiler and libraries.
+You will then need to build the Apache Thrift compiler and libraries.
./configure && make
@@ -17,14 +17,21 @@
See the [Building from source](/docs/BuildingFromSource) guide for any
help with this step.
* ### Writing a .thrift file
-After the Thrift compiler is installed you will need to create a thrift file.
This file is an [interface definition](/docs/idl) made up of [thrift
types](/docs/types) and Services. The services you define in this file are
implemented by the server and are called by any clients.
+After the Thrift compiler is installed you will need to create a .thrift file.
This file is an [interface definition](/docs/idl) made up of [thrift
types](/docs/types) and Services. The services you define in this file are
implemented by the server and are called by any clients.
* ### Generate Thrift file to source code
-The Thrift compiler is used to generate your Thrift File into source code
which is used by the different client libraries and the server you write. To
generate the source from a thrift file run
+The Thrift compiler is used to generate your Thrift file into source code
which is used by the different client libraries and the server you write. To
generate the source from a Thrift file run
thrift --gen <language> <Thrift filename>
- The sample
[tutorial.thrift](https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=tutorial/tutorial.thrift)
file defines a basic calculator service. This will be used to demonstrate both
the client and server.
+ To recursivly generate source code from a Thrift file and all other
Thrift files included by it, run
+
+ thrift -r --gen <language> <Thrift filename>
+
+ The sample
[tutorial.thrift](https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=tutorial/tutorial.thrift)
+ file defines a basic calculator service. This sample caluclator service
.thrift file includes another file called
+
[shared.thrift](https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=tutorial/shared.thrift).
+ Both files will be used to demonstrate how to build a Thrift client and
server pair.
## Examples Clients and Servers
{% endfilter %}
Modified: thrift/cms-site/trunk/templates/tutorial_intro.md
URL:
http://svn.apache.org/viewvc/thrift/cms-site/trunk/templates/tutorial_intro.md?rev=1597655&r1=1597654&r2=1597655&view=diff
==============================================================================
--- thrift/cms-site/trunk/templates/tutorial_intro.md (original)
+++ thrift/cms-site/trunk/templates/tutorial_intro.md Mon May 26 22:14:13 2014
@@ -5,7 +5,7 @@
All Apache Thrift tutorials require that you have:
1. Built and installed the Apache Thrift Compiler and Libraries, see [Building
from source](/docs/BuildingFromSource) for more details.
-1. Generated the
[tutorial.thrift](https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=tutorial/tutorial.thrift)
file as [discussed here](/tutorial/)
+1. Generated the
[tutorial.thrift](https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=tutorial/tutorial.thrift)
and
[shared.thrift](https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=tutorial/shared.thrift)
files as [discussed here](/tutorial/)
thrift -r --gen {{ headers.library_lang }} tutorial.thrift
