Revert "Updated the scons section and added -h option."

This reverts commit ae5c6554d5c5d38f45820171fc069030b16b54f4.

1 files changed, 13 insertions, 58 deletions

diff --git a/index.html b/index.html
index bb6c026..6961509 100644
--- a/index.html
+++ b/index.html
@@ -63,8 +63,8 @@
     <p> 

     Please refer to the <a href="#download">download</a> and <a href="#install">installation</a> sections for details.

     </p> 

-    <p>Earlier versions (2008.1 &mdash 2008.3),based on Linux &nbsp;2.6.24 and (2007.1 &mdash; 2007.3), based on Linux&nbsp;2.6.20 

-    ,support additional scheduling policies, are discussed on separate pages dedicated to the <a href="litmus2007.html">LITMUS<sup>RT</sup> 2008</a> and <a href="litmus2007.html">LITMUS<sup>RT</sup> 2007 </a> series respectively.

+    <p>Earlier versions based on Linux &nbsp;2.6.24 and Linux&nbsp;2.6.20,

+     which supported additional scheduling policies, are discussed on separate pages dedicated to the <a href="litmus2007.html">LITMUS<sup>RT</sup> 2008</a> and <a href="litmus2007.html">LITMUS<sup>RT</sup> 2007 </a> series respectively.

     </p> 

     <p class="nobottommargin"> 

        The first version of LITMUS<sup>RT</sup>, which was implemented in Spring 2006, 

@@ -76,9 +76,9 @@
    <h2 id="support">Support</h2> 

     <div class="box"> 

     <p class="nomargin"> 

-    The LITMUS<sup>RT</sup> development effort is being supported by grants from, SUN Corp.,

-    Intel Corp., IBM Corp., The National Science Foundation (grant CCR 0615197), and The U.S.

-    Army Research Office (grant W911NF-06-1-0425).

+    The LITMUS<sup>RT</sup> development effort is being supported by grants from

+      AT&amp;T, IBM, and Northrop Grumman Corps.; the National Science Foundation (grants CNS 0834270 and CNS 0834132); the U.S.

+    Army Research Office (grant W911NF-09-1-0535); and the Air Force Office of Scientific Research (grant FA 9550-09-1-0549).    

     </p> 

     </div> 

  

@@ -97,17 +97,18 @@
     <li> 

         <a href="http://www.cs.unc.edu/~bbb/">Bj&ouml;rn B. Brandenburg</a> (current maintainer)

     </li> 

-    <li> <a href="http://www.sprg.uniroma2.it/home/bastoni/">Andrea Bastoni</a> (Visiting researcher from University of Rome "Tor Vergata") 

+    <li> <a href="http://www.sprg.uniroma2.it/home/bastoni/">Andrea Bastoni</a> (University of Rome "Tor Vergata") 

     </li> 

     </ul> 

         <p class="nobottommargin"> 

-        (Additional collaborators for <a href="litmus2008.html#collaborators">LITMUS<sup>RT</sup> 2008 series</a> and <a href="litmus2007.html#collaborators">LITMUS<sup>RT</sup> 2007 series</a> contributed to earlier versions of LITMUS<sup>RT</sup>.)

+        Additional collaborators contributed to the previous <a href="litmus2008.html#collaborators">LITMUS<sup>RT</sup> 2008</a> and the <a href="litmus2007.html#collaborators">LITMUS<sup>RT</sup> 2007</a> versions.

         </p> 

     </div> 

     

  

      <h2 id="publications">Publications</h2> 

-    <div class="box">    

+    <div class="box"> 

+  

     <ol class="nomargin">      

     <li><p> 

               B. Brandenburg and J. Anderson,

@@ -330,7 +331,7 @@ Technology and Applications Symposium</cite>, pp. 342-353, April 2008.
     model, a scheduler plugin infrastructure, and some scheduler plugins, as

     well as a user-space library that provides the LITMUS<sup>RT</sup> 

     real-time API. Note that the current implementation only works on the

-    Intel x86-32 and sparc64 architectures.

+    Intel x86-32 and x86-64 architectures.

     </p> 

     <h3>Patching the Kernel</h3> 

     <p class="notopmargin"> 

@@ -379,60 +380,14 @@ make modules
     depends on the LITMUS<sup>RT</sup> kernel kernel and provides its own build system (based on <a href="http://www.scons.org/">scons</a>). 

     In order to compile <span class="src">liblitmus</span>, you need to adjust the

     variable <span class="src">LITMUS_KERNEL</span> in the <span class="src">SConstruct</span> file to point to your 

-    copy of the kernel. Users should not update the <span class="src">SConstruct</span> file manually anymore. Instead, a <span class="src">.config</span> file can be created with appropriate variables. The required variables can be listed using <span class="src"> scons -h </span> command. This command lists the variables required for building the <span class="src"> liblitmus2010 </span> library. <br>

-   Sample output of <span class="src"> scons -h </span> is as shown below.

+    copy of the kernel.

     </p> 

-   <p>

-   <pre class="shell"> 

-scons -h

-scons: Reading SConscript files ...

-scons: done reading SConscript files.

-

-=============================================

-liblitmus --- The LITMUS^RT Userspace Library

-

-There are a number of user-configurable build

-variables. These can either be set on the

-command line (e.g., scons ARCH=x86) or read

-from a local configuration file (.config).

-

-Run 'scons --dump-config' to see the final

-build configuration.

-

-Build Variables

----------------

-

-LITMUS_KERNEL: Where to find the LITMUS^RT kernel. ( /path/to/LITMUS_KERNEL )

-    default: ../litmus2010

-    actual: ../litmus2010

-

-PYTHON_HEADERS: Where to find Python headers. ( /path/to/PYTHON_HEADERS )

-    default: /usr/include/python2.5

-    actual: /usr/include/python2.5

-

-ARCH: Target architecture. (x86_64|sparc64|x86|i686)

-    default: x86_64

-    actual: x86_64

-

-WSS: Working set size for pm analysis

-    default: 3072

-    actual: 3072

-

-Use scons -H for help about command-line options.

-   </pre>

-

-<p class="notopmargin">

- To summarize, the <span class="src"> liblitmus </span> can be obtained and

-    compiled with the following commands:

-</p>

-

 <pre class="shell"> 

 cd $DIR

 wget http://www.cs.unc.edu/~anderson/litmus-rt/download/2010.1/liblitmus-2010.1.tgz

 tar xzf liblitmus-2010.1.tgz

 cd liblitmus 

-

-# set LITMUS_KERNEL in .config to point to the kernel source and compile

+# change LITMUS_KERNEL in SConstruct to point to the kernel source

 scons

 </pre> 

     <p class="nobottommargin"> 

@@ -492,7 +447,7 @@ scons
     Only root can change the active policy, and only when there are no real-time tasks present.

     </p> 

     <p> 

-    If you do not have the <span class="src">dialog</span> utility installed, then you can still use <span class="src">setsched</span> by passing the desired scheduling policy as a commandline parameter, <em>e.g.</em> type <span class="src"> setsched PFAIR </span> to activate the PFAIR plugin.

+    If you do not have the <span class="src">dialog</span> utility installed, then you can still used <span class="src">setsched</span> by passing the desired scheduling policy as a commandline parameter, <em>e.g.</em> type <span class="src"> setsched PFAIR </span> to activate the PFAIR plugin.

     </p> 

     <h3>Writing Real-Time Tasks</h3> 

     <p class="qa">