Author: buildbot
Date: Wed Aug 20 14:34:58 2014
New Revision: 919910
Log:
Staging update by buildbot for thrift
Modified:
websites/staging/thrift/trunk/content/ (props changed)
websites/staging/thrift/trunk/content/about.html
websites/staging/thrift/trunk/content/docs/install/debian.html
websites/staging/thrift/trunk/content/tutorial/hs.html
Propchange: websites/staging/thrift/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Aug 20 14:34:58 2014
@@ -1 +1 @@
-1613565
+1619119
Modified: websites/staging/thrift/trunk/content/about.html
==============================================================================
--- websites/staging/thrift/trunk/content/about.html (original)
+++ websites/staging/thrift/trunk/content/about.html Wed Aug 20 14:34:58 2014
@@ -207,7 +207,7 @@
<tr class="">
<td class="username">roger</td>
<td class="fullname">Roger Meier</td>
- <td>Continuous Integration, C++, C#, JavaScript</td>
+ <td>Continuous Integration, C++, C#, JavaScript, make cross and
other stuff</td>
<td align="right">2</td>
</tr>
@@ -309,6 +309,11 @@
<td class="website"><a
href="http://www.aereo.com";>http://www.aereo.com</a></td>
</tr>
+ <tr class="">
+ <td class="company">Siemens</td>
+ <td class="website"><a
href="http://www.siemens.com";>http://www.siemens.com</a></td>
+ </tr>
+
</tbody>
</table>
</div>
Modified: websites/staging/thrift/trunk/content/docs/install/debian.html
==============================================================================
--- websites/staging/thrift/trunk/content/docs/install/debian.html (original)
+++ websites/staging/thrift/trunk/content/docs/install/debian.html Wed Aug 20
14:34:58 2014
@@ -75,7 +75,7 @@
<div class="container">
<h2 id="debian-or-ubuntu-setup">Debian or Ubuntu setup</h2>
<p>The following command install all the required tools and libraries to build
and install the Apache Thrift compiler on a Debian/Ubuntu Linux based
system.</p>
-<div class="codehilite"><pre><span class="n">sudo</span> <span
class="n">apt</span><span class="o">-</span><span class="n">get</span> <span
class="n">install</span> <span class="n">libboost</span><span
class="o">-</span><span class="n">dev</span> <span
class="n">libboost</span><span class="o">-</span><span
class="n">test</span><span class="o">-</span><span class="n">dev</span> <span
class="n">libboost</span><span class="o">-</span><span
class="n">program</span><span class="o">-</span><span
class="n">options</span><span class="o">-</span><span class="n">dev</span>
<span class="n">libevent</span><span class="o">-</span><span
class="n">dev</span> <span class="n">automake</span> <span
class="n">libtool</span> <span class="n">flex</span> <span
class="n">bison</span> <span class="n">pkg</span><span class="o">-</span><span
class="n">config</span> <span class="n">g</span><span class="o">++</span> <span
class="n">libssl</span><span class="o">-</span><span class="n">dev</span>
+<div class="codehilite"><pre><span class="n">sudo</span> <span
class="n">apt</span><span class="o">-</span><span class="n">get</span> <span
class="n">install</span> <span class="n">libboost</span><span
class="o">-</span><span class="n">dev</span> <span
class="n">libboost</span><span class="o">-</span><span
class="n">test</span><span class="o">-</span><span class="n">dev</span> <span
class="n">libboost</span><span class="o">-</span><span
class="n">program</span><span class="o">-</span><span
class="n">options</span><span class="o">-</span><span class="n">dev</span>
<span class="n">libboost</span><span class="o">-</span><span
class="n">system</span><span class="o">-</span><span class="n">dev</span> <span
class="n">libboost</span><span class="o">-</span><span
class="n">filesystem</span><span class="o">-</span><span class="n">dev</span>
<span class="n">libevent</span><span class="o">-</span><span
class="n">dev</span> <span class="n">automake</span> <span
class="n">libtool</span> <span cl
ass="n">flex</span> <span class="n">bison</span> <span
class="n">pkg</span><span class="o">-</span><span class="n">config</span> <span
class="n">g</span><span class="o">++</span> <span class="n">libssl</span><span
class="o">-</span><span class="n">dev</span>
</pre></div>
@@ -121,7 +121,7 @@
</ul>
</li>
<li>Thrift Compiler for Windows<ul>
-<li>mingw32 mingw32-binutils mingw32-runtime</li>
+<li>mingw32 mingw32-binutils mingw32-runtime nsis</li>
</ul>
</li>
</ul>
Modified: websites/staging/thrift/trunk/content/tutorial/hs.html
==============================================================================
--- websites/staging/thrift/trunk/content/tutorial/hs.html (original)
+++ websites/staging/thrift/trunk/content/tutorial/hs.html Wed Aug 20 14:34:58
2014
@@ -123,27 +123,27 @@
<span class="n">printf</span> <span class="s">"1+1=%d</span><span
class="se">\n</span><span class="s">"</span> <span class="n">sum</span>
- <span class="n">let</span> <span class="n">work</span> <span
class="o">=</span> <span class="n">Work</span> <span class="p">{</span> <span
class="n">f_Work_op</span> <span class="o">=</span> <span class="n">Just</span>
<span class="n">DIVIDE</span><span class="p">,</span>
- <span class="n">f_Work_num1</span> <span
class="o">=</span> <span class="n">Just</span> <span class="mi">1</span><span
class="p">,</span>
- <span class="n">f_Work_num2</span> <span
class="o">=</span> <span class="n">Just</span> <span class="mi">0</span><span
class="p">,</span>
- <span class="n">f_Work_comment</span> <span
class="o">=</span> <span class="n">Nothing</span>
+ <span class="n">let</span> <span class="n">work</span> <span
class="o">=</span> <span class="n">Work</span> <span class="p">{</span> <span
class="n">work_op</span> <span class="o">=</span> <span
class="n">DIVIDE</span><span class="p">,</span>
+ <span class="n">work_num1</span> <span class="o">=</span>
<span class="mi">1</span><span class="p">,</span>
+ <span class="n">work_num2</span> <span class="o">=</span>
<span class="mi">0</span><span class="p">,</span>
+ <span class="n">work_comment</span> <span
class="o">=</span> <span class="n">Nothing</span>
<span class="p">}</span>
<span class="n">Control</span><span class="p">.</span><span
class="n">Exception</span><span class="p">.</span><span class="k">catch</span>
<span class="p">(</span><span class="n">printf</span> <span
class="s">"1/0=%d</span><span class="se">\n</span><span
class="s">"</span> <span class="o">=<<</span> <span
class="n">Client</span><span class="p">.</span><span class="n">calculate</span>
<span class="n">client</span> <span class="mi">1</span> <span
class="n">work</span><span class="p">)</span>
<span class="p">(</span><span class="err">\</span><span
class="n">e</span> <span class="o">-></span> <span class="n">printf</span>
<span class="s">"InvalidOperation %s</span><span class="se">\n</span><span
class="s">"</span> <span class="p">(</span><span class="n">show</span>
<span class="p">(</span><span class="n">e</span> <span class="o">::</span>
<span class="n">InvalidOperation</span><span class="p">)))</span>
- <span class="n">let</span> <span class="n">work</span> <span
class="o">=</span> <span class="n">Work</span> <span class="p">{</span> <span
class="n">f_Work_op</span> <span class="o">=</span> <span class="n">Just</span>
<span class="n">SUBTRACT</span><span class="p">,</span>
- <span class="n">f_Work_num1</span> <span
class="o">=</span> <span class="n">Just</span> <span class="mi">15</span><span
class="p">,</span>
- <span class="n">f_Work_num2</span> <span
class="o">=</span> <span class="n">Just</span> <span class="mi">10</span><span
class="p">,</span>
- <span class="n">f_Work_comment</span> <span
class="o">=</span> <span class="n">Nothing</span>
+ <span class="n">let</span> <span class="n">work</span> <span
class="o">=</span> <span class="n">Work</span> <span class="p">{</span> <span
class="n">work_op</span> <span class="o">=</span> <span
class="n">SUBTRACT</span><span class="p">,</span>
+ <span class="n">work_num1</span> <span class="o">=</span>
<span class="mi">15</span><span class="p">,</span>
+ <span class="n">work_num2</span> <span class="o">=</span>
<span class="mi">10</span><span class="p">,</span>
+ <span class="n">work_comment</span> <span
class="o">=</span> <span class="n">Nothing</span>
<span class="p">}</span>
<span class="n">diff</span> <span class="o"><-</span> <span
class="n">Client</span><span class="p">.</span><span class="n">calculate</span>
<span class="n">client</span> <span class="mi">1</span> <span
class="n">work</span>
<span class="n">printf</span> <span class="s">"15-10=%d</span><span
class="se">\n</span><span class="s">"</span> <span class="n">diff</span>
<span class="n">log</span> <span class="o"><-</span> <span
class="n">SClient</span><span class="p">.</span><span
class="n">getStruct</span> <span class="n">client</span> <span
class="mi">1</span>
- <span class="n">printf</span> <span class="s">"Check log:
%s</span><span class="se">\n</span><span class="s">"</span> <span
class="err">$</span> <span class="n">fromJust</span> <span class="err">$</span>
<span class="n">unpack</span> <span class="err">`</span><span
class="n">fmap</span><span class="err">`</span> <span
class="n">f_SharedStruct_value</span> <span class="n">log</span>
+ <span class="n">printf</span> <span class="s">"Check log:
%s</span><span class="se">\n</span><span class="s">"</span> <span
class="err">$</span> <span class="n">unpack</span> <span class="err">$</span>
<span class="n">sharedStruct_value</span> <span class="n">log</span>
<span class="o">--</span> <span class="n">Close</span><span
class="o">!</span>
</pre></div>
@@ -186,7 +186,7 @@
<span class="n">instance</span> <span class="n">SharedService_Iface</span>
<span class="n">CalculatorHandler</span> <span class="n">where</span>
<span class="n">getStruct</span> <span class="n">self</span> <span
class="n">k</span> <span class="o">=</span> <span class="k">do</span>
<span class="n">myLog</span> <span class="o"><-</span> <span
class="n">readMVar</span> <span class="p">(</span><span
class="n">mathLog</span> <span class="n">self</span><span class="p">)</span>
- <span class="k">return</span> <span class="err">$</span> <span
class="p">(</span><span class="n">myLog</span> <span class="o">!</span> <span
class="p">(</span><span class="n">fromJust</span> <span class="n">k</span><span
class="p">))</span>
+ <span class="k">return</span> <span class="err">$</span> <span
class="p">(</span><span class="n">myLog</span> <span class="o">!</span> <span
class="n">k</span><span class="p">)</span>
<span class="n">instance</span> <span class="n">Calculator_Iface</span> <span
class="n">CalculatorHandler</span> <span class="n">where</span>
@@ -194,8 +194,8 @@
<span class="n">print</span> <span class="s">"ping()"</span>
<span class="n">add</span> <span class="n">_</span> <span
class="n">n1</span> <span class="n">n2</span> <span class="o">=</span> <span
class="k">do</span>
- <span class="n">printf</span> <span class="s">"add(%d,%d)</span><span
class="se">\n</span><span class="s">"</span> <span class="p">(</span><span
class="n">fromJust</span> <span class="n">n1</span><span class="p">)</span>
<span class="p">(</span><span class="n">fromJust</span> <span
class="n">n2</span><span class="p">)</span>
- <span class="k">return</span> <span class="p">((</span><span
class="n">fromJust</span> <span class="n">n1</span><span
class="p">)</span><span class="o">+</span><span class="p">(</span><span
class="n">fromJust</span> <span class="n">n2</span><span class="p">))</span>
+ <span class="n">printf</span> <span class="s">"add(%d,%d)</span><span
class="se">\n</span><span class="s">"</span> <span class="n">n1</span>
<span class="n">n2</span>
+ <span class="k">return</span> <span class="p">(</span><span
class="n">n1</span> <span class="o">+</span> <span class="n">n2</span><span
class="p">)</span>
<span class="n">calculate</span> <span class="n">self</span> <span
class="n">mlogid</span> <span class="n">mwork</span> <span class="o">=</span>
<span class="k">do</span>
<span class="n">printf</span> <span class="s">"calculate(%d,
%s)</span><span class="se">\n</span><span class="s">"</span> <span
class="n">logid</span> <span class="p">(</span><span class="n">show</span>
<span class="n">work</span><span class="p">)</span>
@@ -211,32 +211,32 @@
<span class="k">if</span> <span class="n">num2</span>
<span class="n">work</span> <span class="o">==</span> <span class="mi">0</span>
<span class="n">then</span>
<span class="k">throw</span> <span class="err">$</span>
<span class="n">InvalidOperation</span> <span
class="p">{</span>
- <span
class="n">f_InvalidOperation_what</span> <span class="o">=</span> <span
class="n">Just</span> <span class="err">$</span> <span
class="n">fromIntegral</span> <span class="err">$</span> <span
class="n">fromEnum</span> <span class="err">$</span> <span class="n">op</span>
<span class="n">work</span><span class="p">,</span>
- <span class="n">f_InvalidOperation_why</span>
<span class="o">=</span> <span class="n">Just</span> <span
class="s">"Cannot divide by 0"</span>
+ <span class="n">invalidOperation_what</span>
<span class="o">=</span> <span class="n">fromIntegral</span> <span
class="err">$</span> <span class="n">fromEnum</span> <span class="err">$</span>
<span class="n">op</span> <span class="n">work</span><span class="p">,</span>
+ <span class="n">invalidOperation_why</span>
<span class="o">=</span> <span class="s">"Cannot divide by 0"</span>
<span class="p">}</span>
<span class="k">else</span>
<span class="n">num1</span> <span
class="n">work</span> <span class="err">`</span><span class="n">div</span><span
class="err">`</span> <span class="n">num2</span> <span class="n">work</span>
- <span class="n">let</span> <span class="n">logEntry</span> <span
class="o">=</span> <span class="n">SharedStruct</span> <span
class="p">(</span><span class="n">Just</span> <span class="n">logid</span><span
class="p">)</span> <span class="p">(</span><span class="n">Just</span> <span
class="p">(</span><span class="n">fromString</span> <span class="err">$</span>
<span class="n">show</span> <span class="err">$</span> <span
class="n">val</span><span class="p">))</span>
+ <span class="n">let</span> <span class="n">logEntry</span> <span
class="o">=</span> <span class="n">SharedStruct</span> <span
class="n">logid</span> <span class="p">(</span><span
class="n">fromString</span> <span class="err">$</span> <span
class="n">show</span> <span class="err">$</span> <span
class="n">val</span><span class="p">)</span>
<span class="n">modifyMVar_</span> <span class="p">(</span><span
class="n">mathLog</span> <span class="n">self</span><span class="p">)</span>
<span class="err">$</span> <span class="k">return</span> <span
class="p">.(</span><span class="n">M</span><span class="p">.</span><span
class="n">insert</span> <span class="n">logid</span> <span
class="n">logEntry</span><span class="p">)</span>
<span class="k">return</span> <span class="err">$</span><span
class="o">!</span> <span class="n">val</span>
<span class="n">where</span>
<span class="o">--</span> <span class="n">stupid</span> <span
class="n">dynamic</span> <span class="n">languages</span> <span
class="n">f</span><span class="err">'</span><span class="n">ing</span>
<span class="n">it</span> <span class="n">up</span>
- <span class="n">num1</span> <span class="o">=</span> <span
class="n">fromJust</span> <span class="p">.</span> <span
class="n">f_Work_num1</span>
- <span class="n">num2</span> <span class="o">=</span> <span
class="n">fromJust</span> <span class="p">.</span> <span
class="n">f_Work_num2</span>
- <span class="n">op</span> <span class="o">=</span> <span
class="n">fromJust</span> <span class="p">.</span> <span
class="n">f_Work_op</span>
- <span class="n">logid</span> <span class="o">=</span> <span
class="n">fromJust</span> <span class="n">mlogid</span>
- <span class="n">work</span> <span class="o">=</span> <span
class="n">fromJust</span> <span class="n">mwork</span>
-
-
- <span class="o">--</span><span class="k">return</span> <span
class="n">val</span>
+ <span class="n">num1</span> <span class="o">=</span> <span
class="n">work_num1</span>
+ <span class="n">num2</span> <span class="o">=</span> <span
class="n">work_num2</span>
+ <span class="n">op</span> <span class="o">=</span> <span
class="n">work_op</span>
+ <span class="n">logid</span> <span class="o">=</span> <span
class="n">mlogid</span>
+ <span class="n">work</span> <span class="o">=</span> <span
class="n">mwork</span>
<span class="n">zip</span> <span class="n">_</span> <span class="o">=</span>
<span class="n">print</span> <span class="s">"zip()"</span>
<span class="n">main</span> <span class="o">=</span> <span class="k">do</span>
+ <span class="n">handler</span> <span class="o"><-</span> <span
class="n">newCalculatorHandler</span>
+ <span class="n">print</span> <span class="s">"Starting the
server..."</span>
+ <span class="n">runBasicServer</span> <span class="n">handler</span> <span
class="n">Calculator</span><span class="p">.</span><span
class="n">process</span> <span class="mi">9090</span>
</pre></div>
<p class='snippet_footer'>
